diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-08-21 10:26:46 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-08-21 10:26:46 +0530 |
| commit | eb72478a286e0104f5636d21d86407b4c0e89fa1 (patch) | |
| tree | 5e22366a70251fc841b920bc63c2445583218239 /sysdeps/unix/alpha/sysdep.h | |
| parent | 7e54fd0421500b31626bdb2700aa23d63c4e85c6 (diff) | |
| download | glibc-eb72478a286e0104f5636d21d86407b4c0e89fa1.tar.gz glibc-eb72478a286e0104f5636d21d86407b4c0e89fa1.tar.xz glibc-eb72478a286e0104f5636d21d86407b4c0e89fa1.zip | |
Remove unnecessary uses of NOT_IN_libc
If a IS_IN_* macro is defined, then NOT_IN_libc is always defined,
except obviously for IS_IN_libc. There's no need to check for both.
Verified on x86_64 and i686 that the source is unchanged.
* include/libc-symbols.h: Remove unnecessary check for
NOT_IN_libc.
* nptl/pthreadP.h: Likewise.
* sysdeps/aarch64/setjmp.S: Likewise.
* sysdeps/alpha/setjmp.S: Likewise.
* sysdeps/arm/sysdep.h: Likewise.
* sysdeps/i386/setjmp.S: Likewise.
* sysdeps/m68k/setjmp.c: Likewise.
* sysdeps/posix/getcwd.c: Likewise.
* sysdeps/powerpc/powerpc32/setjmp-common.S: Likewise.
* sysdeps/powerpc/powerpc64/setjmp-common.S: Likewise.
* sysdeps/s390/s390-32/setjmp.S: Likewise.
* sysdeps/s390/s390-64/setjmp.S: Likewise.
* sysdeps/sh/sh3/setjmp.S: Likewise.
* sysdeps/sh/sh4/setjmp.S: Likewise.
* sysdeps/unix/alpha/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/aarch64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/setjmp.S: Likewise.
* sysdeps/unix/sysv/linux/ia64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sh/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/tile/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Likewise.
* sysdeps/x86_64/setjmp.S: Likewise.
Diffstat (limited to 'sysdeps/unix/alpha/sysdep.h')
| -rw-r--r-- | sysdeps/unix/alpha/sysdep.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h index 0c40ca64bc..17dad91819 100644 --- a/sysdeps/unix/alpha/sysdep.h +++ b/sysdeps/unix/alpha/sysdep.h @@ -349,7 +349,7 @@ __LABEL(name) \ we don't deoptimize things by placing the pointer check value there. */ #ifdef __ASSEMBLER__ -# if defined NOT_IN_libc && defined IS_IN_rtld +# ifdef IS_IN_rtld # define PTR_MANGLE(dst, src, tmp) \ ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \ ldq tmp, __pointer_chk_guard_local(tmp) !gprellow; \ @@ -371,8 +371,9 @@ __LABEL(name) \ # define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp) #else # include <stdint.h> -# if (defined NOT_IN_libc && defined IS_IN_rtld) \ - || (!defined SHARED && (!defined NOT_IN_libc || defined IS_IN_libpthread)) +# if (defined IS_IN_rtld \ + || (!defined SHARED && (!defined NOT_IN_libc \ + || defined IS_IN_libpthread))) extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden; # define PTR_MANGLE(var) \ (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local) |