<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Oct 14, 2013 at 1:13 PM, Joerg Sonnenberger <span dir="ltr"><<a href="mailto:joerg@bec.de" target="_blank">joerg@bec.de</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: joerg<br>
Date: Mon Oct 14 15:13:05 2013<br>
New Revision: 192615<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=192615&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=192615&view=rev</a><br>
Log:<br>
For NetBSD/current on X86 do not use libgcc and default to libc++.<br>
Adjust linkage to make more sense for older releases.<br>
<br>
Added:<br>
cfe/trunk/test/Driver/netbsd.c<br>
cfe/trunk/test/Driver/netbsd.cpp<br></blockquote><div><br></div><div>These tests are failing for me:<br><br><div>Command Output (stderr):</div><div>--</div><div>llvm/src/tools/clang/test/Driver/netbsd.c:17:12: error: expected string not found in input</div>
<div>// X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"</div><div> ^</div><div><stdin>:5:72: note: scanning from here</div>
<div> "/usr/bin/ld" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so" "-o" "a.out" "crt0.o" "/usr/lib/crti.o" "crtbegin.o" "/tmp/netbsd-beaf8</div>
<div>f.o" "-lc" "crtend.o" "/usr/lib/crtn.o"</div></div><div><br></div><div><br></div><div>and</div><div><br></div><div><div>Command Output (stderr):</div><div>--</div><div>llvm/src/tools/clang/test/Driver/netbsd.cpp:17:12: error: expected string not found in input</div>
<div>// X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"</div><div> ^</div><div><stdin>:5:72: note: scanning from here</div>
<div> "/usr/bin/ld" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so" "-o" "a.out" "crt0.o" "/usr/lib/crti.o" "crtbegin.o" "/tmp/netbsd-30fe11.o" "-lc++" "-lm" "-lc" "crtend.o" "/usr/lib/crtn.o"</div>
</div><div><br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Modified:<br>
cfe/trunk/lib/Driver/ToolChains.cpp<br>
cfe/trunk/lib/Driver/Tools.cpp<br>
<br>
Modified: cfe/trunk/lib/Driver/ToolChains.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=192615&r1=192614&r2=192615&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=192615&r1=192614&r2=192615&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/ToolChains.cpp (original)<br>
+++ cfe/trunk/lib/Driver/ToolChains.cpp Mon Oct 14 15:13:05 2013<br>
@@ -1982,6 +1982,12 @@ NetBSD::GetCXXStdlibType(const ArgList &<br>
<< A->getAsString(Args);<br>
}<br>
<br>
+ unsigned Major, Minor, Micro;<br>
+ getTriple().getOSVersion(Major, Minor, Micro);<br>
+ if (Major >= 7 || (Major == 6 && Minor == 99 && Micro >= 23) || Major == 0) {<br>
+ if (getArch() == llvm::Triple::x86 || getArch() == llvm::Triple::x86_64)<br>
+ return ToolChain::CST_Libcxx;<br>
+ }<br>
return ToolChain::CST_Libstdcxx;<br>
}<br>
<br>
<br>
Modified: cfe/trunk/lib/Driver/Tools.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=192615&r1=192614&r2=192615&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=192615&r1=192614&r2=192615&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Driver/Tools.cpp (original)<br>
+++ cfe/trunk/lib/Driver/Tools.cpp Mon Oct 14 15:13:05 2013<br>
@@ -5860,34 +5860,39 @@ void netbsd::Link::ConstructJob(Compilat<br>
<br>
AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs);<br>
<br>
+ unsigned Major, Minor, Micro;<br>
+ getToolChain().getTriple().getOSVersion(Major, Minor, Micro);<br>
+ bool useLibgcc = true;<br>
+ if (Major >= 7 || (Major == 6 && Minor == 99 && Micro >= 23) || Major == 0) {<br>
+ if (getToolChain().getArch() == llvm::Triple::x86 ||<br>
+ getToolChain().getArch() == llvm::Triple::x86_64)<br>
+ useLibgcc = false;<br>
+ }<br>
+<br>
if (!Args.hasArg(options::OPT_nostdlib) &&<br>
!Args.hasArg(options::OPT_nodefaultlibs)) {<br>
if (D.CCCIsCXX()) {<br>
getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);<br>
CmdArgs.push_back("-lm");<br>
}<br>
- // FIXME: For some reason GCC passes -lgcc and -lgcc_s before adding<br>
- // the default system libraries. Just mimic this for now.<br>
- if (Args.hasArg(options::OPT_static)) {<br>
- CmdArgs.push_back("-lgcc_eh");<br>
- } else {<br>
- CmdArgs.push_back("--as-needed");<br>
- CmdArgs.push_back("-lgcc_s");<br>
- CmdArgs.push_back("--no-as-needed");<br>
- }<br>
- CmdArgs.push_back("-lgcc");<br>
-<br>
if (Args.hasArg(options::OPT_pthread))<br>
CmdArgs.push_back("-lpthread");<br>
CmdArgs.push_back("-lc");<br>
<br>
- CmdArgs.push_back("-lgcc");<br>
- if (Args.hasArg(options::OPT_static)) {<br>
- CmdArgs.push_back("-lgcc_eh");<br>
- } else {<br>
- CmdArgs.push_back("--as-needed");<br>
- CmdArgs.push_back("-lgcc_s");<br>
- CmdArgs.push_back("--no-as-needed");<br>
+ if (useLibgcc) {<br>
+ if (Args.hasArg(options::OPT_static)) {<br>
+ // libgcc_eh depends on libc, so resolve as much as possible,<br>
+ // pull in any new requirements from libc and then get the rest<br>
+ // of libgcc.<br>
+ CmdArgs.push_back("-lgcc_eh");<br>
+ CmdArgs.push_back("-lc");<br>
+ CmdArgs.push_back("-lgcc");<br>
+ } else {<br>
+ CmdArgs.push_back("-lgcc");<br>
+ CmdArgs.push_back("--as-needed");<br>
+ CmdArgs.push_back("-lgcc_s");<br>
+ CmdArgs.push_back("--no-as-needed");<br>
+ }<br>
}<br>
}<br>
<br>
<br>
Added: cfe/trunk/test/Driver/netbsd.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.c?rev=192615&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.c?rev=192615&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/netbsd.c (added)<br>
+++ cfe/trunk/test/Driver/netbsd.c Mon Oct 14 15:13:05 2013<br>
@@ -0,0 +1,45 @@<br>
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=X86_64 %s<br>
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd7.0.0 %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=X86_64-7 %s<br>
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd6.0.0 %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=X86_64-6 %s<br>
+<br>
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd %s -static -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=S-X86_64 %s<br>
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd7.0.0 -static %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=S-X86_64-7 %s<br>
+// RUN: %clang -no-canonical-prefixes -target x86_64--netbsd6.0.0 -static %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=S-X86_64-6 %s<br>
+<br>
+// X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"<br>
+// X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"<br>
+// X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"<br>
+// X86_64: "crtend.o" "crtn.o"<br>
+<br>
+// X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"<br>
+// X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"<br>
+// X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"<br>
+// X86_64-7: "crtend.o" "crtn.o"<br>
+<br>
+// X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"<br>
+// X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"<br>
+// X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"<br>
+// X86_64-6: "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"<br>
+// X86_64-6: "crtend.o" "crtn.o"<br>
+<br>
+// S-X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"<br>
+// S-X86_64: ld{{.*}}" "-Bstatic"<br>
+// S-X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"<br>
+// S-X86_64: "crtend.o" "crtn.o"<br>
+<br>
+// S-X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"<br>
+// S-X86_64-7: ld{{.*}}" "-Bstatic"<br>
+// S-X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"<br>
+// S-X86_64-7: "crtend.o" "crtn.o"<br>
+<br>
+// S-X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"<br>
+// S-X86_64-6: ld{{.*}}" "-Bstatic"<br>
+// S-X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc"<br>
+// S-X86_64-6: "-lgcc_eh" "-lc" "-lgcc"<br>
+// S-X86_64-6: "crtend.o" "crtn.o"<br>
<br>
Added: cfe/trunk/test/Driver/netbsd.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.cpp?rev=192615&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/netbsd.cpp?rev=192615&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Driver/netbsd.cpp (added)<br>
+++ cfe/trunk/test/Driver/netbsd.cpp Mon Oct 14 15:13:05 2013<br>
@@ -0,0 +1,45 @@<br>
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=X86_64 %s<br>
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd7.0.0 %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=X86_64-7 %s<br>
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd6.0.0 %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=X86_64-6 %s<br>
+<br>
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd %s -static -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=S-X86_64 %s<br>
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd7.0.0 -static %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=S-X86_64-7 %s<br>
+// RUN: %clangxx -no-canonical-prefixes -target x86_64--netbsd6.0.0 -static %s -### 2>&1 \<br>
+// RUN: | FileCheck -check-prefix=S-X86_64-6 %s<br>
+<br>
+// X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"<br>
+// X86_64: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"<br>
+// X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"<br>
+// X86_64: "-lm" "-lc" "crtend.o" "crtn.o"<br>
+<br>
+// X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"<br>
+// X86_64-7: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"<br>
+// X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"<br>
+// X86_64-7: "-lm" "-lc" "crtend.o" "crtn.o"<br>
+<br>
+// X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"<br>
+// X86_64-6: ld{{.*}}" "--eh-frame-hdr" "-dynamic-linker" "/libexec/ld.elf_so"<br>
+// X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lstdc++"<br>
+// X86_64-6: "-lm" "-lc" "-lgcc" "--as-needed" "-lgcc_s" "--no-as-needed"<br>
+// X86_64-6: "crtend.o" "crtn.o"<br>
+<br>
+// S-X86_64: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd"<br>
+// S-X86_64: ld{{.*}}" "-Bstatic"<br>
+// S-X86_64: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"<br>
+// S-X86_64: "-lm" "-lc" "crtend.o" "crtn.o"<br>
+<br>
+// S-X86_64-7: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd7.0.0"<br>
+// S-X86_64-7: ld{{.*}}" "-Bstatic"<br>
+// S-X86_64-7: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lc++"<br>
+// S-X86_64-7: "-lm" "-lc" "crtend.o" "crtn.o"<br>
+<br>
+// S-X86_64-6: clang{{.*}}" "-cc1" "-triple" "x86_64--netbsd6.0.0"<br>
+// S-X86_64-6: ld{{.*}}" "-Bstatic"<br>
+// S-X86_64-6: "-o" "a.out" "crt0.o" "crti.o" "crtbegin.o" "{{.*}}.o" "-lstdc++"<br>
+// S-X86_64-6: "-lm" "-lc" "-lgcc_eh" "-lc" "-lgcc"<br>
+// S-X86_64-6: "crtend.o" "crtn.o"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>