Author: qcolombet
Date: Tue Jan 7 19:02:06 2014
New Revision: 198722
URL: http://llvm.org/viewvc/llvm-project?rev=198722&view=rev
Log:
[Driver] Fix a typo in the setting of the arch name when -arch x86_64h is used.
<rdar://problem/15711488>
Modified:
cfe/trunk/lib/Driver/Driver.cpp
cfe/trunk/test/Driver/darwin-ld.c
Modified: cfe/trunk/lib/Driver/Driver.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=198722&r1=198721&r2=198722&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Tue Jan 7 19:02:06 2014
@@ -1879,7 +1879,7 @@ static llvm::Triple computeTargetTriple(
// Handle the Darwin '-arch' flag.
if (Arg *A = Args.getLastArg(options::OPT_arch)) {
if (StringRef(A->getValue()) == "x86_64h")
- Target.setArchName(DarwinArchName);
+ Target.setArchName(A->getValue());
else {
llvm::Triple::ArchType DarwinArch
= tools::darwin::getArchTypeForDarwinArchName(A->getValue());
Modified: cfe/trunk/test/Driver/darwin-ld.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/darwin-ld.c?rev=198722&r1=198721&r2=198722&view=diff
==============================================================================
--- cfe/trunk/test/Driver/darwin-ld.c (original)
+++ cfe/trunk/test/Driver/darwin-ld.c Tue Jan 7 19:02:06 2014
@@ -148,3 +148,12 @@
//
// LINK_X86_64H_ARCH: {{ld(.exe)?"}}
// LINK_X86_64H_ARCH: "x86_64h"
+
+// RUN: %clang -target x86_64-apple-darwin -arch x86_64 -arch x86_64h -###
%t.o 2> %t.log
+// RUN: FileCheck -check-prefix=LINK_X86_64H_MULTIARCH %s < %t.log
+//
+// LINK_X86_64H_MULTIARCH: {{ld(.exe)?"}}
+// LINK_X86_64H_MULTIARCH: "x86_64"
+//
+// LINK_X86_64H_MULTIARCH: {{ld(.exe)?"}}
+// LINK_X86_64H_MULTIARCH: "x86_64h"
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
