[llvm-branch-commits] [cfe-branch] r105054 - /cfe/branches/Apple/whitney/lib/CodeGen/CGException.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri May 28 18:07:33 2010
New Revision: 105054

URL: http://llvm.org/viewvc/llvm-project?rev=105054&view=rev
Log:
Merge r104999:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Fri May 28 19:43:36 2010 +0000

    Fix personality function name when using SjLj exceptions.

Modified:
    cfe/branches/Apple/whitney/lib/CodeGen/CGException.cpp

Modified: cfe/branches/Apple/whitney/lib/CodeGen/CGException.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/CodeGen/CGException.cpp?rev=105054&r1=105053&r2=105054&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/CodeGen/CGException.cpp (original)
+++ cfe/branches/Apple/whitney/lib/CodeGen/CGException.cpp Fri May 28 18:07:33 2010
@@ -126,9 +126,12 @@
 static llvm::Constant *getPersonalityFn(CodeGenModule &CGM) {
   const char *PersonalityFnName = "__gcc_personality_v0";
   LangOptions Opts = CGM.getLangOptions();
-  if (Opts.CPlusPlus)
+  if (Opts.CPlusPlus) {
+    if (Opts.SjLjExceptions)
+     PersonalityFnName = "__gxx_personality_sj0";
+    else
      PersonalityFnName = "__gxx_personality_v0";
-  else if (Opts.ObjC1) {
+  } else if (Opts.ObjC1) {
     if (Opts.NeXTRuntime) {
       if (Opts.ObjCNonFragileABI)
         PersonalityFnName = "__gcc_personality_v0";