summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog18
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h2
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S4
-rw-r--r--sysdeps/arm/dl-machine.h4
-rw-r--r--sysdeps/arm/strlen.S2
-rw-r--r--sysdeps/arm/sysdep.h17
-rw-r--r--sysdeps/unix/arm/brk.S2
-rw-r--r--sysdeps/unix/arm/fork.S2
-rw-r--r--sysdeps/unix/arm/sysdep.S4
-rw-r--r--sysdeps/unix/arm/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/arm/clone.S2
-rw-r--r--sysdeps/unix/sysv/linux/arm/mmap.S4
-rw-r--r--sysdeps/unix/sysv/linux/arm/mmap64.S4
-rw-r--r--sysdeps/unix/sysv/linux/arm/socket.S4
-rw-r--r--sysdeps/unix/sysv/linux/arm/sysdep.h4
-rw-r--r--sysdeps/unix/sysv/linux/arm/vfork.S4
17 files changed, 57 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d1126eac0..37b677a4b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-11-18 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * sysdeps/arm/sysdep.h: Define __USE_BX__ if bx is available.
+ Use it instead of __THUMB_INTERWORK__. Make RETINSTR take
+ only a condition and a register.
+ * sysdeps/arm/dl-machine.h: Use __USE_BX__ instead of
+ __THUMB_INTERWORK__.
+ (_dl_start_user): Use BX.
+ * sysdeps/arm/strlen.S: Use DO_RET.
+ * sysdeps/unix/arm/brk.S, sysdeps/unix/arm/fork.S,
+ sysdeps/unix/arm/sysdep.S, sysdeps/unix/arm/sysdep.h: Likewise.
+ * sysdeps/unix/sysv/linux/arm/clone.S,
+ sysdeps/unix/sysv/linux/arm/mmap.S,
+ sysdeps/unix/sysv/linux/arm/mmap64.S,
+ sysdeps/unix/sysv/linux/arm/socket.S,
+ sysdeps/unix/sysv/linux/arm/sysdep.h,
+ sysdeps/unix/sysv/linux/arm/vfork.S: Update uses of RETINSTR.
+
2004-12-02 Roland McGrath <roland@redhat.com>
* extra-lib.mk (object-suffixes-$(lib)): Add .oS when
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index e983f61b34..d9cf6d7951 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-18 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * sysdeps/unix/sysv/linux/arm/sysdep-cancel.h: Update RETINSTR use.
+ * sysdeps/unix/sysv/linux/arm/vfork.S: Likewise.
+
2004-12-02 Roland McGrath <roland@redhat.com>
* Makefile (libpthread-nonshared): Variable removed.
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
index 92d8460e26..019bd54913 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/arm/sysdep-cancel.h
@@ -112,7 +112,7 @@ extern int __local_multiple_threads attribute_hidden;
# define MAYBE_SAVE_LR \
str lr, [sp, $-4]!;
# define PSEUDO_RET_MOV \
- RETINSTR(movcc, pc, lr); \
+ RETINSTR(cc, lr); \
b PLTJMP(SYSCALL_ERROR)
# define PSEUDO_PROLOGUE
# else
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S b/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S
index 23687342d1..2708c701eb 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S
+++ b/linuxthreads/sysdeps/unix/sysv/linux/arm/vfork.S
@@ -46,7 +46,7 @@ ENTRY (__vfork)
swi __NR_vfork
cmn a1, #4096
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
#ifndef __ASSUME_VFORK_SYSCALL
/* Check if vfork syscall is known at all. */
@@ -60,7 +60,7 @@ ENTRY (__vfork)
/* If we don't have vfork, fork is close enough. */
swi __NR_fork
cmn a1, #4096
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
#elif !defined __NR_vfork
# error "__NR_vfork not available and __ASSUME_VFORK_SYSCALL defined"
#endif
diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 5dfe3346f5..761f8daeaa 100644
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -123,7 +123,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
return lazy;
}
-#if defined(__THUMB_INTERWORK__)
+#if defined(__USE_BX__)
#define BX(x) "bx\t" #x
#else
#define BX(x) "mov\tpc, " #x
@@ -293,7 +293,7 @@ _dl_start_user:\n\
ldr r0, .L_FINI_PROC\n\
add r0, sl, r0\n\
@ jump to the user_s entry point\n\
- mov pc, r6\n\
+ " BX(r6) "\n\
.L_GET_GOT:\n\
.word _GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4\n\
.L_SKIP_ARGS:\n\
diff --git a/sysdeps/arm/strlen.S b/sysdeps/arm/strlen.S
index a83c41d26a..86e16652e4 100644
--- a/sysdeps/arm/strlen.S
+++ b/sysdeps/arm/strlen.S
@@ -68,6 +68,6 @@ Llastword: @ drop through to here once we find a
tstne r2, $0x00ff0000 @ (if first three all non-zero, 4th
addne r0, r0, $1 @ must be zero)
#endif
- RETINSTR(mov,pc,lr)
+ DO_RET(lr)
END(strlen)
libc_hidden_builtin_def (strlen)
diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index cb3f105afe..8ca77a60cb 100644
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -19,6 +19,11 @@
#include <sysdeps/generic/sysdep.h>
+#if (!defined (__ARM_ARCH_2__) && !defined (__ARM_ARCH_3__) \
+ && !defined (__ARM_ARCH_3M__) && !defined (__ARM_ARCH_4__))
+# define __USE_BX__
+#endif
+
#ifdef __ASSEMBLER__
/* Syntactic details of assembler. */
@@ -50,20 +55,22 @@
#ifdef __APCS_32__
#define LOADREGS(cond, base, reglist...)\
ldm##cond base,reglist
-#define RETINSTR(instr, regs...)\
- instr regs
-#ifdef __THUMB_INTERWORK__
+#ifdef __USE_BX__
+#define RETINSTR(cond, reg) \
+ bx##cond reg
#define DO_RET(_reg) \
bx _reg
#else
+#define RETINSTR(cond, reg) \
+ mov##cond pc, reg
#define DO_RET(_reg) \
mov pc, _reg
#endif
#else /* APCS-26 */
#define LOADREGS(cond, base, reglist...)\
ldm##cond base,reglist^
-#define RETINSTR(instr, regs...)\
- instr##s regs
+#define RETINSTR(cond, reg) \
+ mov##cond##s pc, reg
#define DO_RET(_reg) \
movs pc, _reg
#endif
diff --git a/sysdeps/unix/arm/brk.S b/sysdeps/unix/arm/brk.S
index 9e20dc6932..914e8a8bbe 100644
--- a/sysdeps/unix/arm/brk.S
+++ b/sysdeps/unix/arm/brk.S
@@ -43,7 +43,7 @@ SYSCALL__ (brk, 1)
#endif
str r0, [r1]
mov r0, $0
- RETINSTR(mov, pc, r14)
+ DO_RET (r14)
#ifdef PIC
1: .long _GLOBAL_OFFSET_TABLE_ - 2b - 8
_cb_addr:
diff --git a/sysdeps/unix/arm/fork.S b/sysdeps/unix/arm/fork.S
index b317b66a97..bd00c92cfe 100644
--- a/sysdeps/unix/arm/fork.S
+++ b/sysdeps/unix/arm/fork.S
@@ -27,7 +27,7 @@ SYSCALL__ (fork, 0)
R0&-1==R0, and the child gets R0&0==0. */
sub r1, r1, $1
and r0, r0, r1
- RETINSTR(mov, pc, r14)
+ DO_RET (r14)
PSEUDO_END (__fork)
libc_hidden_def (__fork)
diff --git a/sysdeps/unix/arm/sysdep.S b/sysdeps/unix/arm/sysdep.S
index 5fc80a872e..4810805d85 100644
--- a/sysdeps/unix/arm/sysdep.S
+++ b/sysdeps/unix/arm/sysdep.S
@@ -50,7 +50,7 @@ syscall_error:
ldr r1, 1f
str r0, [r1]
mvn r0, $0
- RETINSTR(mov, pc, r14)
+ DO_RET (r14)
1: .long C_SYMBOL_NAME(errno)
#else
@@ -60,7 +60,7 @@ syscall_error:
0: add r2, pc, r2
str r0, [r1, r2]
mvn r0, $0
- RETINSTR(mov, pc, r14)
+ DO_RET (r14)
1: .word _GLOBAL_OFFSET_TABLE_ - 0b - 8
2: .word C_SYMBOL_NAME(errno)(GOTOFF)
diff --git a/sysdeps/unix/arm/sysdep.h b/sysdeps/unix/arm/sysdep.h
index d776b45aa2..5f36272f27 100644
--- a/sysdeps/unix/arm/sysdep.h
+++ b/sysdeps/unix/arm/sysdep.h
@@ -24,7 +24,7 @@
#ifdef __ASSEMBLER__
-#define ret RETINSTR(mov, pc, r14)
+#define ret DO_RET (r14)
#define MOVE(a,b) mov b,a
#endif
diff --git a/sysdeps/unix/sysv/linux/arm/clone.S b/sysdeps/unix/sysv/linux/arm/clone.S
index 1c6f7861cf..bf07fb3952 100644
--- a/sysdeps/unix/sysv/linux/arm/clone.S
+++ b/sysdeps/unix/sysv/linux/arm/clone.S
@@ -45,7 +45,7 @@ ENTRY(__clone)
swi SYS_ify(clone)
movs a1, a1
blt PLTJMP(C_SYMBOL_NAME(__syscall_error))
- RETINSTR(movne, pc, lr)
+ RETINSTR(ne, lr)
@ pick the function arg and call address off the stack and execute
ldr r0, [sp, #4]
diff --git a/sysdeps/unix/sysv/linux/arm/mmap.S b/sysdeps/unix/sysv/linux/arm/mmap.S
index 7beba6841c..cf6f253378 100644
--- a/sysdeps/unix/sysv/linux/arm/mmap.S
+++ b/sysdeps/unix/sysv/linux/arm/mmap.S
@@ -51,7 +51,7 @@ ENTRY (__mmap)
ldr r5, [sp], #4
cmn r0, $4096
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
b PLTJMP(syscall_error)
.Linval:
@@ -83,7 +83,7 @@ ENTRY (__mmap)
add sp, sp, #16
cmn r0, $4096
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
b PLTJMP(syscall_error);
#endif
diff --git a/sysdeps/unix/sysv/linux/arm/mmap64.S b/sysdeps/unix/sysv/linux/arm/mmap64.S
index f8361b5cbf..b4b712c2f2 100644
--- a/sysdeps/unix/sysv/linux/arm/mmap64.S
+++ b/sysdeps/unix/sysv/linux/arm/mmap64.S
@@ -43,12 +43,12 @@ ENTRY (__mmap64)
# ifdef __ASSUME_MMAP2_SYSCALL
ldr r4, [sp], #4
ldr r5, [sp], #4
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
b PLTJMP(syscall_error)
# else
ldrcc r4, [sp], #4
ldrcc r5, [sp], #4
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
cmn r0, $ENOSYS
bne .Lerror
/* The current kernel does not support mmap2. Fall back to plain
diff --git a/sysdeps/unix/sysv/linux/arm/socket.S b/sysdeps/unix/sysv/linux/arm/socket.S
index 3e93ceb6d2..212a489afe 100644
--- a/sysdeps/unix/sysv/linux/arm/socket.S
+++ b/sysdeps/unix/sysv/linux/arm/socket.S
@@ -91,7 +91,7 @@ ENTRY (__socket)
/* r0 is < 0 if there was an error. */
cmn r0, $124
- RETINSTR(movcc, pc, r14)
+ RETINSTR(cc, r14)
b PLTJMP(SYSCALL_ERROR)
#if defined NEED_CANCELLATION && defined CENABLE
@@ -114,7 +114,7 @@ ENTRY (__socket)
/* r0 is < 0 if there was an error. */
cmn r0, $124
- RETINSTR(movcc, pc, r14)
+ RETINSTR(cc, r14)
b PLTJMP(SYSCALL_ERROR)
#endif
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index fda7c5b267..668aa1a2f1 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -54,7 +54,7 @@
cmn r0, $4096;
#define PSEUDO_RET \
- RETINSTR(movcc, pc, lr); \
+ RETINSTR(cc, lr); \
b PLTJMP(SYSCALL_ERROR)
#undef ret
#define ret PSEUDO_RET
@@ -71,7 +71,7 @@
DO_CALL (syscall_name, args);
#define PSEUDO_RET_NOERRNO \
- RETINSTR(mov, pc, lr);
+ DO_RET (lr);
#undef ret_NOERRNO
#define ret_NOERRNO PSEUDO_RET_NOERRNO
diff --git a/sysdeps/unix/sysv/linux/arm/vfork.S b/sysdeps/unix/sysv/linux/arm/vfork.S
index bba1a548ba..9ef5114b24 100644
--- a/sysdeps/unix/sysv/linux/arm/vfork.S
+++ b/sysdeps/unix/sysv/linux/arm/vfork.S
@@ -32,7 +32,7 @@ ENTRY (__vfork)
#ifdef __NR_vfork
swi __NR_vfork
cmn a1, #4096
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
# ifdef __ASSUME_VFORK_SYSCALL
b PLTJMP(C_SYMBOL_NAME(__syscall_error))
@@ -47,7 +47,7 @@ ENTRY (__vfork)
/* If we don't have vfork, fork is close enough. */
swi __NR_fork
cmn a1, #4096
- RETINSTR(movcc, pc, lr)
+ RETINSTR(cc, lr)
b PLTJMP(C_SYMBOL_NAME(__syscall_error))
#elif !defined __NR_vfork
# error "__NR_vfork not available and __ASSUME_VFORK_SYSCALL defined"
View Lorry Controller Status