aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@codesourcery.com>2006-03-02 15:23:41 +0000
committerDaniel Jacobowitz <dan@codesourcery.com>2006-03-02 15:23:41 +0000
commit43b83c6fe172730ffe39b3fbcf54add3ce92b084 (patch)
tree851bdaf4fdc4e4774eeb066e2ace03847e170357
parent33ca998a4f3272beb0f2e75db7c535d77c03347f (diff)
downloadglibc-43b83c6fe172730ffe39b3fbcf54add3ce92b084.tar.xz
glibc-43b83c6fe172730ffe39b3fbcf54add3ce92b084.zip
* sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h
(PSEUDO): Inline correct versions of PSEUDO_RET_MOV and MAYBE_SAVE_LR. (PSEUDO_RET_MOV, MAYBE_SAVE_LR): Don't define.
-rw-r--r--ChangeLog.arm6
-rw-r--r--sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h12
2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog.arm b/ChangeLog.arm
index 3f510d29e1..017847529e 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,5 +1,11 @@
2006-03-02 Daniel Jacobowitz <dan@codesourcery.com>
+ * sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h
+ (PSEUDO): Inline correct versions of PSEUDO_RET_MOV and MAYBE_SAVE_LR.
+ (PSEUDO_RET_MOV, MAYBE_SAVE_LR): Don't define.
+
+2006-03-02 Daniel Jacobowitz <dan@codesourcery.com>
+
* sysdeps/unix/sysv/linux/arm/eabi/Makefile (arm-using-eabi): Set.
* sysdeps/unix/sysv/linux/arm/nptl/Makefile: New file.
diff --git a/sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h b/sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h
index cd4d171c70..b35d34728d 100644
--- a/sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h
+++ b/sysdeps/unix/sysv/linux/arm/linuxthreads/sysdep-cancel.h
@@ -50,9 +50,10 @@
bne .Lpseudo_cancel; \
DO_CALL (syscall_name, args); \
cmn r0, $4096; \
- PSEUDO_RET_MOV; \
+ RETINSTR(cc, lr); \
+ b PLTJMP(SYSCALL_ERROR); \
.Lpseudo_cancel: \
- MAYBE_SAVE_LR; \
+ str lr, [sp, $-4]!; \
DOCARGS_##args; /* save syscall args around CENABLE. */ \
CENABLE; \
mov ip, r0; /* put mask in safe place. */ \
@@ -108,11 +109,6 @@ extern int __local_multiple_threads attribute_hidden;
ldr ip, =__local_multiple_threads; \
ldr ip, [ip]; \
teq ip, #0;
-# define MAYBE_SAVE_LR \
- str lr, [sp, $-4]!;
-# define PSEUDO_RET_MOV \
- RETINSTR(cc, lr); \
- b PLTJMP(SYSCALL_ERROR)
# define PSEUDO_PROLOGUE
# else
# define SINGLE_THREAD_P \
@@ -122,8 +118,6 @@ extern int __local_multiple_threads attribute_hidden;
teq ip, #0;
# define PSEUDO_PROLOGUE \
1: .word __local_multiple_threads - 2f - 8;
-# define MAYBE_SAVE_LR /* lr already saved */
-# define PSEUDO_RET_MOV PSEUDO_RET
# endif
# endif