[llvm-branch-commits] [llvm-tag] r109457 - in /llvm/tags/Apple/llvmCore-2364.1: ./ lib/ExecutionEngine/JIT/JIT.cpp utils/buildit/build_llvm

[Bob Wilson]

Author: bwilson
Date: Mon Jul 26 17:24:28 2010
New Revision: 109457

URL: http://llvm.org/viewvc/llvm-project?rev=109457&view=rev
Log:
Copy from llvmCore-2364 + svn 109196 and 109451

Added:
    llvm/tags/Apple/llvmCore-2364.1/
      - copied from r109455, llvm/tags/Apple/llvmCore-2364/
Modified:
    llvm/tags/Apple/llvmCore-2364.1/lib/ExecutionEngine/JIT/JIT.cpp
    llvm/tags/Apple/llvmCore-2364.1/utils/buildit/build_llvm

Modified: llvm/tags/Apple/llvmCore-2364.1/lib/ExecutionEngine/JIT/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2364.1/lib/ExecutionEngine/JIT/JIT.cpp?rev=109457&r1=109455&r2=109457&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2364.1/lib/ExecutionEngine/JIT/JIT.cpp (original)
+++ llvm/tags/Apple/llvmCore-2364.1/lib/ExecutionEngine/JIT/JIT.cpp Mon Jul 26 17:24:28 2010
@@ -67,7 +67,7 @@
 }
 
 
-#if defined(__GNUC__) && !defined(__ARM__EABI__)
+#if defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__USING_SJLJ_EXCEPTIONS__)
  
 // libgcc defines the __register_frame function to dynamically register new
 // dwarf frames for exception handling. This functionality is not portable
@@ -308,7 +308,7 @@
   }
   
   // Register routine for informing unwinding runtime about new EH frames
-#if defined(__GNUC__) && !defined(__ARM_EABI__)
+#if defined(__GNUC__) && !defined(__ARM_EABI__) && !defined(__USING_SJLJ_EXCEPTIONS__)
 #if USE_KEYMGR
   struct LibgccObjectInfo* LOI = (struct LibgccObjectInfo*)
     _keymgr_get_and_lock_processwide_ptr(KEYMGR_GCC3_DW2_OBJ_LIST);

Modified: llvm/tags/Apple/llvmCore-2364.1/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2364.1/utils/buildit/build_llvm?rev=109457&r1=109455&r2=109457&view=diff
==============================================================================
--- llvm/tags/Apple/llvmCore-2364.1/utils/buildit/build_llvm (original)
+++ llvm/tags/Apple/llvmCore-2364.1/utils/buildit/build_llvm Mon Jul 26 17:24:28 2010
@@ -100,7 +100,7 @@
   # Try to use the platform llvm-gcc. Fall back to gcc if it's not available.
   for prog in gcc g++ ; do
     P=$DIR/bin/arm-apple-darwin$DARWIN_VERS-${prog}
-    T=`xcrun -find llvm-${prog}`
+    T=`xcrun -sdk $SDKROOT -find llvm-${prog}`
     if [ "x$T" = "x" ] ; then
       T=`xcrun -sdk $SDKROOT -find ${prog}`
     fi