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

[Daniel Dunbar]

Author: ddunbar
Date: Thu Dec  1 18:45:48 2011
New Revision: 145657

URL: http://llvm.org/viewvc/llvm-project?rev=145657&view=rev
Log:
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.

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=145657&r1=145656&r2=145657&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Thu Dec  1 18:45:48 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=145657&r1=145656&r2=145657&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
+++ compiler-rt/trunk/make/platform/clang_darwin.mk Thu Dec  1 18:45:48 2011
@@ -64,7 +64,7 @@
 #
 # 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.