From bdcabb255cf539df9a75525ceda4697af7383ae7 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 3 Oct 2006 16:33:50 +0000 Subject: [PATCH] 2006-10-03 Jeff Johnston * arm/linux-syscalls0.c: Rewrite bx insn architecture flag check to avoid use of __ARM_ARCH__. --- libgloss/ChangeLog | 5 +++++ libgloss/arm/linux-syscalls0.S | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 990502083..4d493f3d8 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,8 @@ +2006-10-03 Jeff Johnston + + * arm/linux-syscalls0.c: Rewrite bx insn architecture flag check + to avoid use of __ARM_ARCH__. + 2006-10-02 Nick Clifton * arm/linux-syscalls0.c: Add arm architecture flag diff --git a/libgloss/arm/linux-syscalls0.S b/libgloss/arm/linux-syscalls0.S index 7b1e82a52..81e21fd87 100644 --- 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)