diff options
Diffstat (limited to 'sysdeps/arm')
| -rw-r--r-- | sysdeps/arm/armv7/multiarch/memcpy.S | 2 | ||||
| -rw-r--r-- | sysdeps/arm/memmove.S | 2 | ||||
| -rw-r--r-- | sysdeps/arm/sysdep.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sysdeps/arm/armv7/multiarch/memcpy.S b/sysdeps/arm/armv7/multiarch/memcpy.S index c4f4e80..3439cb7 100644 --- a/sysdeps/arm/armv7/multiarch/memcpy.S +++ b/sysdeps/arm/armv7/multiarch/memcpy.S @@ -22,7 +22,7 @@ #include <sysdep.h> #include <rtld-global-offsets.h> -#ifndef NOT_IN_libc +#if IS_IN (libc) /* Under __ARM_NEON__, memcpy_neon.S defines the name memcpy. */ # ifndef __ARM_NEON__ .text diff --git a/sysdeps/arm/memmove.S b/sysdeps/arm/memmove.S index 04aa7db..488e156 100644 --- a/sysdeps/arm/memmove.S +++ b/sysdeps/arm/memmove.S @@ -69,7 +69,7 @@ ENTRY(memmove) subs ip, r0, r1 cmphi r2, ip -#ifdef NOT_IN_libc +#if !IS_IN (libc) bls memcpy #else bls HIDDEN_JUMPTARGET(memcpy) diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h index bc86d5a..62f74eb 100644 --- a/sysdeps/arm/sysdep.h +++ b/sysdeps/arm/sysdep.h @@ -344,7 +344,7 @@ /* Pointer mangling support. */ #if (IS_IN (rtld) || \ - (!defined SHARED && (!defined NOT_IN_libc || IS_IN (libpthread)))) + (!defined SHARED && (IS_IN (libc) || IS_IN (libpthread)))) # ifdef __ASSEMBLER__ # define PTR_MANGLE_LOAD(guard, tmp) \ LDR_HIDDEN (guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local), 0) |