diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-05-13 10:03:45 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-05-13 10:03:45 -0700 |
| commit | bba6da4e1b9c0faf12ec9a48a2822434d9e6bbcd (patch) | |
| tree | 41d566510bfa2d2b3768a9feb0a62d1f572bf0ca | |
| parent | e0db65176fa88b9497cbd6362b24e3225382bfb6 (diff) | |
| download | glibc-bba6da4e1b9c0faf12ec9a48a2822434d9e6bbcd.tar.gz glibc-bba6da4e1b9c0faf12ec9a48a2822434d9e6bbcd.tar.xz glibc-bba6da4e1b9c0faf12ec9a48a2822434d9e6bbcd.zip | |
Consolidate NPTL vs non clone.S for ARM.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/clone.S | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/nptl/clone.S | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 1bee32a39d..7e4715c3cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-05-13 Roland McGrath <roland@hack.frob.com> + * sysdeps/unix/sysv/linux/arm/clone.S: Include <tcb-offsets.h>. + Deconditionalize the code that was previously under [RESET_PID]. + * sysdeps/unix/sysv/linux/arm/nptl/clone.S: File removed. + * sysdeps/generic/exit-thread.h: New file. * sysdeps/unix/sysv/linux/exit-thread.h: New file. * include/unistd.h (__exit_thread): Remove declaration. diff --git a/sysdeps/unix/sysv/linux/arm/clone.S b/sysdeps/unix/sysv/linux/arm/clone.S index 03fe9ab728..a2e910ef64 100644 --- a/sysdeps/unix/sysv/linux/arm/clone.S +++ b/sysdeps/unix/sysv/linux/arm/clone.S @@ -20,6 +20,7 @@ and invokes a function in the right context after its all over. */ #include <sysdep.h> +#include <tcb-offsets.h> #define _ERRNO_H 1 #include <bits/errno.h> @@ -45,9 +46,7 @@ ENTRY(__clone) @ do the system call @ get flags mov r0, r2 -#ifdef RESET_PID mov ip, r2 -#endif @ new sp is already in r1 push {r4, r7} cfi_adjust_cfa_offset (8) @@ -71,7 +70,6 @@ PSEUDO_END (__clone) 1: .fnstart .cantunwind -#ifdef RESET_PID tst ip, #CLONE_THREAD bne 3f GET_TLS (lr) @@ -85,7 +83,6 @@ PSEUDO_END (__clone) str r0, NEGOFF_OFF1 (r1, TID_OFFSET) str r0, NEGOFF_OFF2 (r1, PID_OFFSET, TID_OFFSET) 3: -#endif @ pick the function arg and call address off the stack and execute ldr r0, [sp, #4] ldr ip, [sp], #8 diff --git a/sysdeps/unix/sysv/linux/arm/nptl/clone.S b/sysdeps/unix/sysv/linux/arm/nptl/clone.S deleted file mode 100644 index 23750b3f88..0000000000 --- a/sysdeps/unix/sysv/linux/arm/nptl/clone.S +++ /dev/null @@ -1,3 +0,0 @@ -#define RESET_PID -#include <tcb-offsets.h> -#include "../clone.S" |