diff options
| author | Mike Stump <mikestump@comcast.net> | 2013-11-22 20:33:06 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2013-11-22 20:33:06 +0000 |
| commit | 486294d4ed073012d6dac3a20e22b830176fd0e9 (patch) | |
| tree | d063336e500efa886d96bbf63c80b5c3d7b56c06 /libsanitizer/sanitizer_common | |
| parent | 31519c38639cf4317f5c4bb905f907c3a325d230 (diff) | |
| download | gcc-486294d4ed073012d6dac3a20e22b830176fd0e9.zip gcc-486294d4ed073012d6dac3a20e22b830176fd0e9.tar.gz gcc-486294d4ed073012d6dac3a20e22b830176fd0e9.tar.bz2 | |
sanitizer_linux.cc (__sanitizer): Grab one change from upstream to fix build.
* sanitizer_common/sanitizer_linux.cc (__sanitizer): Grab one
change from upstream to fix build.
From-SVN: r205285
Diffstat (limited to 'libsanitizer/sanitizer_common')
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc index 2763313..ddc6546 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc @@ -785,7 +785,6 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, * %r8 = new_tls, * %r10 = child_tidptr) */ - ".cfi_endproc\n" "syscall\n" /* if (%rax != 0) @@ -795,8 +794,9 @@ uptr internal_clone(int (*fn)(void *), void *child_stack, int flags, void *arg, "jnz 1f\n" /* In the child. Terminate unwind chain. */ - ".cfi_startproc\n" - ".cfi_undefined %%rip;\n" + // XXX: We should also terminate the CFI unwind chain + // here. Unfortunately clang 3.2 doesn't support the + // necessary CFI directives, so we skip that part. "xorq %%rbp,%%rbp\n" /* Call "fn(arg)". */ |