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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Nov 19 13:49:49 2010
New Revision: 119826

URL: http://llvm.org/viewvc/llvm-project?rev=119826&view=rev
Log:
Merge r119809:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Fri Nov 19 17:51:40 2010 +0000

    Driver/Darwin: Don't pass -demangle to an iOS linker, which may not understand
    it.

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=119826&r1=119825&r2=119826&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Driver/Tools.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Driver/Tools.cpp Fri Nov 19 13:49:49 2010
@@ -2374,7 +2374,13 @@
 
   // Newer linkers support -demangle, pass it if supported and not disabled by
   // the user.
-  if (Version[0] >= 100 && !Args.hasArg(options::OPT_Z_Xlinker__no_demangle)) {
+  //
+  // FIXME: We temporarily avoid passing -demangle to any iOS linker, because
+  // unfortunately we can't be guaranteed that the linker version used there
+  // will match the linker version detected at configure time. We need the
+  // universal driver.
+  if (Version[0] >= 100 && !Args.hasArg(options::OPT_Z_Xlinker__no_demangle) &&
+      !getDarwinToolChain().isTargetIPhoneOS()) {
     // Don't pass -demangle to ld_classic.
     //
     // FIXME: This is a temporary workaround, ld should be handling this.