diff options
| author | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2014-12-30 19:23:48 +0000 |
|---|---|---|
| committer | Michael Kuperstein <michael.m.kuperstein@intel.com> | 2014-12-30 19:23:48 +0000 |
| commit | c43b063358a8b307b17faecae850e6d3d8b5ff49 (patch) | |
| tree | 08ab358dfeec9ff1829c6cb31f3264546a0004a7 | |
| parent | 9161d474763335fab36f31c21824df2a811ed098 (diff) | |
| download | bcm5719-llvm-c43b063358a8b307b17faecae850e6d3d8b5ff49.tar.gz bcm5719-llvm-c43b063358a8b307b17faecae850e6d3d8b5ff49.zip | |
[COFF] Don't try to add quotes to already quoted linker directives
If a linker directive is already quoted, don't try to quote it again, otherwise it creates a mess.
This pops up in places like:
#pragma comment(linker,"\"/foo bar'\"")
Differential Revision: http://reviews.llvm.org/D6792
llvm-svn: 224998
| -rw-r--r-- | llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp | 2 | ||||
| -rwxr-xr-x | llvm/test/MC/COFF/linker-options.ll | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp index be811a12d5f..9f1e06b4725 100644 --- a/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp +++ b/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp @@ -932,7 +932,7 @@ emitModuleFlags(MCStreamer &Streamer, StringRef Op = MDOption->getString(); // Lead with a space for consistency with our dllexport implementation. std::string Escaped(" "); - if (Op.find(" ") != StringRef::npos) { + if (!Op.startswith("\"") && (Op.find(" ") != StringRef::npos)) { // The PE-COFF spec says args with spaces must be quoted. It doesn't say // how to escape quotes, but it probably uses this algorithm: // http://msdn.microsoft.com/en-us/library/17w5ykft(v=vs.85).aspx diff --git a/llvm/test/MC/COFF/linker-options.ll b/llvm/test/MC/COFF/linker-options.ll index 335696c3a58..a5b866632cc 100755 --- a/llvm/test/MC/COFF/linker-options.ll +++ b/llvm/test/MC/COFF/linker-options.ll @@ -1,6 +1,6 @@ ; RUN: llc -O0 -mtriple=i386-pc-win32 -filetype=asm -o - %s | FileCheck %s -!0 = !{i32 6, !"Linker Options", !{!{!"/DEFAULTLIB:msvcrt.lib"}, !{!"/DEFAULTLIB:msvcrt.lib", !"/DEFAULTLIB:secur32.lib"}, !{!"/DEFAULTLIB:C:\5Cpath to\5Casan_rt.lib"}, !{!"/with spaces"}}} +!0 = !{i32 6, !"Linker Options", !{!{!"/DEFAULTLIB:msvcrt.lib"}, !{!"/DEFAULTLIB:msvcrt.lib", !"/DEFAULTLIB:secur32.lib"}, !{!"/DEFAULTLIB:C:\5Cpath to\5Casan_rt.lib"}, !{!"/with spaces"}, !{!"\22/quoted spaces\22"}}} !llvm.module.flags = !{ !0 } @@ -14,4 +14,5 @@ define dllexport void @foo() { ; CHECK: .ascii " /DEFAULTLIB:secur32.lib" ; CHECK: .ascii " \"/DEFAULTLIB:C:\\path to\\asan_rt.lib\"" ; CHECK: .ascii " \"/with spaces\"" +; CHECK: .ascii " \"/quoted spaces\"" ; CHECK: .ascii " /EXPORT:_foo" |
