From 486294d4ed073012d6dac3a20e22b830176fd0e9 Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Fri, 22 Nov 2013 20:33:06 +0000 Subject: [PATCH] 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 --- libsanitizer/ChangeLog | 5 +++++ libsanitizer/sanitizer_common/sanitizer_linux.cc | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 9afe7970a28c..000ca18c8f43 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2013-11-22 Mike Stump + + * sanitizer_common/sanitizer_linux.cc (__sanitizer): Grab one + change from upstream to fix build. + 2013-11-18 Yury Gribov PR sanitizer/59106 diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc index 2763313015ab..ddc65465ef74 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)". */ -- 2.47.3