diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2013-09-23 01:44:38 -0400 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2013-09-23 01:44:38 -0400 |
| commit | 0b1f8e35640f5b3f7af11764ade3ff060211c309 (patch) | |
| tree | 92c24c5c5a32e067121f24c0d752f222345faf5e /sysdeps/generic | |
| parent | c61b4d41c9647a54a329aa021341c0eb032b793e (diff) | |
| download | glibc-0b1f8e35640f5b3f7af11764ade3ff060211c309.tar glibc-0b1f8e35640f5b3f7af11764ade3ff060211c309.tar.gz glibc-0b1f8e35640f5b3f7af11764ade3ff060211c309.tar.bz2 glibc-0b1f8e35640f5b3f7af11764ade3ff060211c309.zip | |
BZ #15754: Fix test case for ARM.
Statically built binaries use __pointer_chk_guard_local,
while dynamically built binaries use __pointer_chk_guard.
Provide the right definition depending on the test case
we are building.
Diffstat (limited to 'sysdeps/generic')
| -rw-r--r-- | sysdeps/generic/stackguard-macros.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sysdeps/generic/stackguard-macros.h b/sysdeps/generic/stackguard-macros.h index 4fa3d96f79..b4a6b23ff8 100644 --- a/sysdeps/generic/stackguard-macros.h +++ b/sysdeps/generic/stackguard-macros.h @@ -3,5 +3,10 @@ extern uintptr_t __stack_chk_guard; #define STACK_CHK_GUARD __stack_chk_guard +#ifdef PTRGUARD_LOCAL extern uintptr_t __pointer_chk_guard_local; -#define POINTER_CHK_GUARD __pointer_chk_guard_local +# define POINTER_CHK_GUARD __pointer_chk_guard_local +#else +extern uintptr_t __pointer_chk_guard; +# define POINTER_CHK_GUARD __pointer_chk_guard +#endif |