Revert "[Driver] Quote clang full version in dwarf producer when invoking cc1as"

This reverts commit r264813 / 6484b95d634f53dd929c75265ef3c4decf397584.

While using it in the shell is fine, this a problem when cc1as is
invoked directly by the driver because single quoting the clang full
version makes cc1as write out the version with the quotes in the final
binary.

If the user wants to copy-n-pastable output, it could use either -###
or CC_PRINT_OPTIONS=1 clang -v ...

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

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index f0199aab2745ce3d0d69452695ad4339b786ca50..1cc1369f330eccef2965ea83e57400df787c5ec3 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -6251,8 +6251,7 @@ void ClangAs::ConstructJob(Compilation &C, const JobAction &JA,
     // Set the AT_producer to the clang version when using the integrated
     // assembler on assembly source files.
     CmdArgs.push_back("-dwarf-debug-producer");
-    std::string QuotedClangVersion("'" + getClangFullVersion() + "'");
-    CmdArgs.push_back(Args.MakeArgString(QuotedClangVersion));
+    CmdArgs.push_back(Args.MakeArgString(getClangFullVersion()));
 
     // And pass along -I options
     Args.AddAllArgs(CmdArgs, options::OPT_I);

diff --git a/test/Misc/cc1as-asm.s b/test/Misc/cc1as-asm.s
index 36549c020e17177c6e0bd33018eaf9bb1dff6642..af92644073ac9ab4174c4feb2b29804b7b2c6c86 100644 (file)
--- a/test/Misc/cc1as-asm.s
+++ b/test/Misc/cc1as-asm.s
@@ -1,5 +1,3 @@
 // Run cc1as asm output path just to make sure it works
 // REQUIRES: x86-registered-target
 // RUN: %clang -cc1as -triple x86_64-apple-macosx10.10.0 -filetype asm %s -o /dev/null
-// Test that cc1as is able to consume a quoted clang full version
-// RUN: %clang -cc1as -triple x86_64-apple-macosx10.10.0 -dwarf-debug-producer 'clang dummy version' -filetype asm %s -o /dev/null