[cfe-commits] r168217 - /cfe/trunk/lib/Driver/Tools.cpp

[Bill Wendling]

Author: void
Date: Fri Nov 16 17:03:00 2012
New Revision: 168217

URL: http://llvm.org/viewvc/llvm-project?rev=168217&view=rev
Log:
Revert r167799. It's not really correct, and it doesn't fix the problem that it was intended to fix.

Modified:
    cfe/trunk/lib/Driver/Tools.cpp

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=168217&r1=168216&r2=168217&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Fri Nov 16 17:03:00 2012
@@ -4399,22 +4399,15 @@
       CmdArgs.push_back("-demangle");
   }
 
-  if (Version[0] >= 116 && D.IsUsingLTO(Args)) {
-    if (NeedsTempPath(Inputs)) {
-      // If we are using LTO, then automatically create a temporary file path
-      // for the linker to use, so that it's lifetime will extend past a
-      // possible dsymutil step.
-      const char *TmpPath = C.getArgs().MakeArgString(
-        D.GetTemporaryPath("cc", types::getTypeTempSuffix(types::TY_Object)));
-      C.addTempFile(TmpPath);
-      CmdArgs.push_back("-object_path_lto");
-      CmdArgs.push_back(TmpPath);
-    }
-
-    // FIXME: Disable the creation of accelerator tables when using LTO. They
-    // don't currently work and can cause other tools to bork.
-    CmdArgs.push_back("-mllvm");
-    CmdArgs.push_back("-dwarf-accel-tables=Disable");
+  // If we are using LTO, then automatically create a temporary file path for
+  // the linker to use, so that it's lifetime will extend past a possible
+  // dsymutil step.
+  if (Version[0] >= 116 && D.IsUsingLTO(Args) && NeedsTempPath(Inputs)) {
+    const char *TmpPath = C.getArgs().MakeArgString(
+      D.GetTemporaryPath("cc", types::getTypeTempSuffix(types::TY_Object)));
+    C.addTempFile(TmpPath);
+    CmdArgs.push_back("-object_path_lto");
+    CmdArgs.push_back(TmpPath);
   }
 
   // Derived from the "link" spec.