[llvm-branch-commits] [llvm-gcc-branch] r104429 - in /llvm-gcc-4.2/branches/Apple/Hermes: ./ gcc/llvm-convert.cpp

[Jim Grosbach]

Author: grosbach
Date: Fri May 21 21:22:55 2010
New Revision: 104429

URL: http://llvm.org/viewvc/llvm-project?rev=104429&view=rev
Log:
merge r104420 104423

Modified:
    llvm-gcc-4.2/branches/Apple/Hermes/   (props changed)
    llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp

Propchange: llvm-gcc-4.2/branches/Apple/Hermes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 21 21:22:55 2010
@@ -1 +1 @@
-/llvm-gcc-4.2/trunk:100565,100624-100626,101304,102589
+/llvm-gcc-4.2/trunk:100565,100624-100626,101304,102589,104420,104423

Modified: llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp?rev=104429&r1=104428&r2=104429&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Hermes/gcc/llvm-convert.cpp Fri May 21 21:22:55 2010
@@ -5950,6 +5950,16 @@
         return false;
       }
     }
+#if defined(TARGET_ARM) && defined(CONFIG_DARWIN_H)
+    Value *Buf = Emit(TREE_VALUE(arglist), 0);
+    Buf = Builder.CreateBitCast(Buf, Type::getInt8Ty(Context)->getPointerTo());
+    Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
+                                                 Intrinsic::eh_sjlj_longjmp),
+                      Buf);
+    Result = 0;
+    return true;
+#endif
+    // Fall-through
   }
   case BUILT_IN_APPLY_ARGS:
   case BUILT_IN_APPLY: