build/asan: Better fix for ASAN i386 build on Darwin, this causes us to see the
non-standard struct names.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@145658 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/asan/asan_rtl.cc b/lib/asan/asan_rtl.cc
index e7dc047..7fb3b92 100644
--- a/lib/asan/asan_rtl.cc
+++ b/lib/asan/asan_rtl.cc
@@ -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__)
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index cea3fa4..492fcfc 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -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)