2006-10-03 Jeff Johnston <jjohnstn@redhat.com>

        * arm/linux-syscalls0.c: Rewrite bx insn architecture flag check         to avoid use of __ARM_ARCH__.

diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 9905020..4d493f3 100644 (file)
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-03  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * arm/linux-syscalls0.c: Rewrite bx insn architecture flag check 
+       to avoid use of __ARM_ARCH__.
+
 2006-10-02  Nick Clifton  <nickc@redhat.com>
 
        * arm/linux-syscalls0.c: Add arm architecture flag

diff --git a/libgloss/arm/linux-syscalls0.S b/libgloss/arm/linux-syscalls0.S
index 7b1e82a..81e21fd 100644 (file)
--- a/libgloss/arm/linux-syscalls0.S
+++ b/libgloss/arm/linux-syscalls0.S
@@ -203,10 +203,11 @@ FUNC(_socketcall_tail)
        bl _socketcall
        pop { r3 }
        add sp, #16
-#if (__ARM_ARCH__ > 4) || defined(__ARM_ARCH_4T__)
-       bx r3
-#else
+#if defined(__ARM_ARCH_2__) || defined(__ARM_ARCH_3__) \
+    || defined(__ARM_ARCH_3M__) || defined(__ARM_ARCH_4__)
        mov pc, r3
+#else
+       bx r3
 #endif
        SIZE(_socketcall_tail)