maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

build/asan: Better fix for ASAN i386 build on Darwin, this causes us to see the 

non-standard struct names.

llvm-svn: 145658
This commit is contained in:
Daniel Dunbar 2011-12-02 00:52:55 +00:00
parent 8a5fd211ab
commit cf7fb02388
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/lib/asan/asan_rtl.cc
View File

@ -250,10 +250,10 @@ void GetPcSpBpAx(void *context,
*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__)

4
compiler-rt/make/platform/clang_darwin.mk
View File

@ -103,12 +103,12 @@ IOSSIM_DEPLOYMENT_ARGS += -isysroot $(ProjSrcRoot)/SDKs/darwin
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)