[llvm-branch-commits] [cfe-branch] r118796 - /cfe/branches/Apple/whitney/lib/Driver/Tools.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Thu Nov 11 11:07:29 2010
New Revision: 118796

URL: http://llvm.org/viewvc/llvm-project?rev=118796&view=rev
Log:
Merge r118786:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Thu Nov 11 16:08:59 2010 +0000

    Driver: Allow build system override of default non-fragile ABI version.

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

Modified: cfe/branches/Apple/whitney/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Driver/Tools.cpp?rev=118796&r1=118795&r2=118796&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Driver/Tools.cpp Thu Nov 11 11:07:29 2010
@@ -1376,7 +1376,11 @@
                        options::OPT_fno_objc_nonfragile_abi,
                        getToolChain().IsObjCNonFragileABIDefault())) {
         // Determine the non-fragile ABI version to use.
+#ifdef DISABLE_DEFAULT_NONFRAGILEABI_TWO
+        unsigned NonFragileABIVersion = 1;
+#else
         unsigned NonFragileABIVersion = 2;
+#endif
 
         if (Arg *A = Args.getLastArg(
               options::OPT_fobjc_nonfragile_abi_version_EQ)) {