diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2013-11-06 21:50:42 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2013-11-06 13:50:42 -0800 |
| commit | e45de14ec7cfe457637bfea7ad214ab6158eefe5 (patch) | |
| tree | 69851a8c1b8b2b57f8cff2a7ff551f6c93367edf /libsanitizer/sanitizer_common | |
| parent | 38693e39b6de02d0e868e18a73de39e62fee3936 (diff) | |
| download | gcc-e45de14ec7cfe457637bfea7ad214ab6158eefe5.zip gcc-e45de14ec7cfe457637bfea7ad214ab6158eefe5.tar.gz gcc-e45de14ec7cfe457637bfea7ad214ab6158eefe5.tar.bz2 | |
Fix internal_clone for x32
PR sanitizer/59018
* sanitizer_common/sanitizer_linux.cc (internal_clone): Allocate
2 64-bit integers to save and restore fn and arg. Properly load
newtls/child_tidptr into r8/r10.
From-SVN: r204481
Diffstat (limited to 'libsanitizer/sanitizer_common')
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc index e48bee5..2763313 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc @@ -772,9 +772,11 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, if (!fn || !child_stack) return -EINVAL; CHECK_EQ(0, (uptr)child_stack % 16); - child_stack = (char *)child_stack - 2 * sizeof(void *); - ((void **)child_stack)[0] = (void *)(uptr)fn; - ((void **)child_stack)[1] = arg; + child_stack = (char *)child_stack - 2 * sizeof(unsigned long long); + ((unsigned long long *)child_stack)[0] = (uptr)fn; + ((unsigned long long *)child_stack)[1] = (uptr)arg; + register void *r8 __asm__ ("r8") = newtls; + register int *r10 __asm__ ("r10") = child_tidptr; __asm__ __volatile__( /* %rax = syscall(%rax = __NR_clone, * %rdi = flags, @@ -783,8 +785,6 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, * %r8 = new_tls, * %r10 = child_tidptr) */ - "movq %6,%%r8\n" - "movq %7,%%r10\n" ".cfi_endproc\n" "syscall\n" @@ -816,9 +816,9 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, "S"(child_stack), "D"(flags), "d"(parent_tidptr), - "r"(newtls), - "r"(child_tidptr) - : "rsp", "memory", "r8", "r10", "r11", "rcx"); + "r"(r8), + "r"(r10) + : "rsp", "memory", "r11", "rcx"); return res; } #endif // defined(__x86_64__) |