[llvm-branch-commits] [cfe-branch] r115808 - /cfe/branches/Apple/williamson/lib/Driver/Tools.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Oct  6 13:41:37 2010
New Revision: 115808

URL: http://llvm.org/viewvc/llvm-project?rev=115808&view=rev
Log:
Merge r115730:
--
Author: John McCall <rjmccall at apple.com>
Date:   Wed Oct 6 01:40:51 2010 +0000

    Teach the driver to pass -fexceptions in Objective-C inputs on ARM.
    I don't know when this stopped happening, but this seems to be the
    right place to do it.

Modified:
    cfe/branches/Apple/williamson/lib/Driver/Tools.cpp

Modified: cfe/branches/Apple/williamson/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/williamson/lib/Driver/Tools.cpp?rev=115808&r1=115807&r2=115808&view=diff
==============================================================================
--- cfe/branches/Apple/williamson/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/williamson/lib/Driver/Tools.cpp Wed Oct  6 13:41:37 2010
@@ -680,14 +680,15 @@
     return true;
 
   // As do Objective-C non-fragile ABI inputs and all Objective-C inputs on
-  // x86_64 after SnowLeopard.
+  // x86_64 and ARM after SnowLeopard.
   if (types::isObjC(InputType)) {
     if (Args.hasArg(options::OPT_fobjc_nonfragile_abi))
       return true;
     if (Triple.getOS() != llvm::Triple::Darwin)
       return false;
     return (Triple.getDarwinMajorNumber() >= 9 &&
-            Triple.getArch() == llvm::Triple::x86_64);
+            (Triple.getArch() == llvm::Triple::x86_64 ||
+             Triple.getArch() == llvm::Triple::arm));
   }
 
   return false;