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  <nickc@redhat.com>
+
+	* arm/linux-syscalls0.c: Add arm architecture flag
+	checks around bx insn.
+
 2006-09-07  Masaki Muranaka  <monaka@monami-software.com>
 
 	* 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)