diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-12-02 00:45:48 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-12-02 00:45:48 +0000 |
| commit | 8a5fd211abadad865a5e72997acdfab71c25290d (patch) | |
| tree | 2ba1352cf431ab3f56bf0266ff8198d0c4ce7bda | |
| parent | 65cdbf58a7dc562b184fd70b3126717662bab607 (diff) | |
| download | bcm5719-llvm-8a5fd211abadad865a5e72997acdfab71c25290d.tar.gz bcm5719-llvm-8a5fd211abadad865a5e72997acdfab71c25290d.zip | |
build/asan: Fix ASAN build for i386, for reasons I don't really understand we
get the DARWIN_UNIX03 definition on x86_64 but not on i386.
llvm-svn: 145657
| -rw-r--r-- | compiler-rt/lib/asan/asan_rtl.cc | 8 | ||||
| -rw-r--r-- | compiler-rt/make/platform/clang_darwin.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc index 7fb3b92b0b0..e7dc04754ef 100644 --- a/compiler-rt/lib/asan/asan_rtl.cc +++ b/compiler-rt/lib/asan/asan_rtl.cc @@ -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__) diff --git a/compiler-rt/make/platform/clang_darwin.mk b/compiler-rt/make/platform/clang_darwin.mk index 05014b9e342..cea3fa46c86 100644 --- a/compiler-rt/make/platform/clang_darwin.mk +++ b/compiler-rt/make/platform/clang_darwin.mk @@ -64,7 +64,7 @@ UniversalArchs.profile_ios := $(call CheckArches,i386 x86_64 armv6 armv7) # # Note that ASAN doesn't appear to currently support i386. Configs += asan_osx -UniversalArchs.asan_osx := $(call CheckArches,x86_64) +UniversalArchs.asan_osx := $(call CheckArches,i386 x86_64) # If RC_SUPPORTED_ARCHS is defined, treat it as a list of the architectures we # are intended to support and limit what we try to build to that. |
