aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/arm
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/arm')
-rw-r--r--sysdeps/arm/__longjmp.S2
-rw-r--r--sysdeps/arm/aeabi_unwind_cpp_pr1.c6
-rw-r--r--sysdeps/arm/setjmp.S2
-rw-r--r--sysdeps/arm/sysdep.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/arm/__longjmp.S b/sysdeps/arm/__longjmp.S
index a983957..6124631 100644
--- a/sysdeps/arm/__longjmp.S
+++ b/sysdeps/arm/__longjmp.S
@@ -76,7 +76,7 @@ ENTRY (__longjmp)
#endif
#ifdef NEED_HWCAP
-# ifdef IS_IN_rtld
+# if IS_IN (rtld)
LDST_PCREL (ldr, a4, a3, \
C_SYMBOL_NAME(_rtld_local_ro) \
+ RTLD_GLOBAL_RO_DL_HWCAP_OFFSET)
diff --git a/sysdeps/arm/aeabi_unwind_cpp_pr1.c b/sysdeps/arm/aeabi_unwind_cpp_pr1.c
index f650613..fa7e960 100644
--- a/sysdeps/arm/aeabi_unwind_cpp_pr1.c
+++ b/sysdeps/arm/aeabi_unwind_cpp_pr1.c
@@ -27,7 +27,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr0 (void)
{
-#ifndef IS_IN_rtld
+#if !IS_IN (rtld)
abort ();
#endif
}
@@ -36,7 +36,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr1 (void)
{
-#ifndef IS_IN_rtld
+#if !IS_IN (rtld)
abort ();
#endif
}
@@ -45,7 +45,7 @@ attribute_hidden
void
__aeabi_unwind_cpp_pr2 (void)
{
-#ifndef IS_IN_rtld
+#if !IS_IN (rtld)
abort ();
#endif
}
diff --git a/sysdeps/arm/setjmp.S b/sysdeps/arm/setjmp.S
index 6f54ab3..4dfbf8e 100644
--- a/sysdeps/arm/setjmp.S
+++ b/sysdeps/arm/setjmp.S
@@ -57,7 +57,7 @@ ENTRY (__sigsetjmp)
#ifdef NEED_HWCAP
/* Check if we have a VFP unit. */
-# ifdef IS_IN_rtld
+# if IS_IN (rtld)
LDST_PCREL (ldr, a3, a4, \
C_SYMBOL_NAME(_rtld_local_ro) \
+ RTLD_GLOBAL_RO_DL_HWCAP_OFFSET)
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index 9299be2..bc86d5a 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -343,7 +343,7 @@
#endif
/* Pointer mangling support. */
-#if (defined IS_IN_rtld || \
+#if (IS_IN (rtld) || \
(!defined SHARED && (!defined NOT_IN_libc || IS_IN (libpthread))))
# ifdef __ASSEMBLER__
# define PTR_MANGLE_LOAD(guard, tmp) \