[llvm-commits] [compiler-rt] r145658 - in /compiler-rt/trunk: lib/asan/asan_rtl.cc make/platform/clang_darwin.mk

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec  1 18:52:55 2011
New Revision: 145658

URL: http://llvm.org/viewvc/llvm-project?rev=145658&view=rev
Log:
build/asan: Better fix for ASAN i386 build on Darwin, this causes us to see the
non-standard struct names.

Modified:
    compiler-rt/trunk/lib/asan/asan_rtl.cc
    compiler-rt/trunk/make/platform/clang_darwin.mk

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=145658&r1=145657&r2=145658&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Thu Dec  1 18:52:55 2011
@@ -250,10 +250,10 @@
   *sp = ucontext->uc_mcontext->__ss.__rsp;
   *ax = ucontext->uc_mcontext->__ss.__rax;
 # else
-  *pc = ucontext->uc_mcontext->ss.eip;
-  *bp = ucontext->uc_mcontext->ss.ebp;
-  *sp = ucontext->uc_mcontext->ss.esp;
-  *ax = ucontext->uc_mcontext->ss.eax;
+  *pc = ucontext->uc_mcontext->__ss.__eip;
+  *bp = ucontext->uc_mcontext->__ss.__ebp;
+  *sp = ucontext->uc_mcontext->__ss.__esp;
+  *ax = ucontext->uc_mcontext->__ss.__eax;
 # endif  // __WORDSIZE
 #else  // assume linux
 # if defined(__arm__)

Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=145658&r1=145657&r2=145658&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
+++ compiler-rt/trunk/make/platform/clang_darwin.mk Thu Dec  1 18:52:55 2011
@@ -103,12 +103,12 @@
 CFLAGS.eprintf		:= $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
 CFLAGS.10.4		:= $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
 # FIXME: We can't build ASAN with our stub SDK yet.
-CFLAGS.asan_osx         := $(CFLAGS) -mmacosx-version-min=10.4
+CFLAGS.asan_osx         := $(CFLAGS) -mmacosx-version-min=10.5
 CFLAGS.asan_osx         += \
 		-DASAN_USE_SYSINFO=1 \
 		-DASAN_NEEDS_SEGV=1 \
 		-DASAN_HAS_EXCEPTIONS=1 \
-		-DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0 \
+		-DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0
 
 CFLAGS.ios.i386		:= $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
 CFLAGS.ios.x86_64	:= $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)