Revert r167799. It's not really correct, and it doesn't fix the problem that it was...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@168217 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 8763f7aa77a0c1ee76ba04fc8ed4bbe020ad78db..01bcf48485c10493b0dd9ee97e8620190acb48bf 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -4399,22 +4399,15 @@ void darwin::Link::AddLinkArgs(Compilation &C,
       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.