From 04a8b4ee184b29123106c45adb03aa111319c94f Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 2 Oct 2006 19:57:46 +0000 Subject: [PATCH] 2006-10-02 Nick Clifton * arm/linux-syscalls0.c: Add arm architecture flag checks around bx insn. --- libgloss/ChangeLog | 5 +++++ libgloss/arm/linux-syscalls0.S | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index fd0e3f126..990502083 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,8 @@ +2006-10-02 Nick Clifton + + * arm/linux-syscalls0.c: Add arm architecture flag + checks around bx insn. + 2006-09-07 Masaki Muranaka * xstormy16/Makefile.in (clean): Fix a mismatched parenthesis. diff --git a/libgloss/arm/linux-syscalls0.S b/libgloss/arm/linux-syscalls0.S index f58d5ed77..7b1e82a52 100644 --- a/libgloss/arm/linux-syscalls0.S +++ b/libgloss/arm/linux-syscalls0.S @@ -203,7 +203,11 @@ FUNC(_socketcall_tail) bl _socketcall pop { r3 } add sp, #16 +#if (__ARM_ARCH__ > 4) || defined(__ARM_ARCH_4T__) bx r3 +#else + mov pc, r3 +#endif SIZE(_socketcall_tail) #define SOCKETCALL2(name, NAME) SOCKETCALL(name, NAME)