diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/biarch.c | 41 |
2 files changed, 42 insertions, 1 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index e2e6abceef0..647d2ca2b37 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1947,7 +1947,7 @@ static llvm::Triple computeTargetTriple(StringRef DefaultTargetTriple, Target.setEnvironment(llvm::Triple::CODE16); } - if (AT != llvm::Triple::UnknownArch) + if (AT != llvm::Triple::UnknownArch && AT != Target.getArch()) Target.setArch(AT); } diff --git a/clang/test/Driver/biarch.c b/clang/test/Driver/biarch.c new file mode 100644 index 00000000000..1f0982e3c5d --- /dev/null +++ b/clang/test/Driver/biarch.c @@ -0,0 +1,41 @@ +// RUN: %clang -target i386--netbsd -m32 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "i386--netbsd"' %t + +// RUN: %clang -target i386--netbsd -m64 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "x86_64--netbsd"' %t + +// RUN: %clang -target x86_64--netbsd -m32 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "i386--netbsd"' %t + +// RUN: %clang -target x86_64--netbsd -m64 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "x86_64--netbsd"' %t + +// RUN: %clang -target armv6--netbsd-eabihf -m32 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "armv6--netbsd-eabihf"' %t + +// RUN: %clang -target sparcv9--netbsd -m32 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "sparc--netbsd"' %t + +// RUN: %clang -target sparcv9--netbsd -m64 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "sparcv9--netbsd"' %t + +// RUN: %clang -target sparc64--netbsd -m64 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "sparc64--netbsd"' %t + +// RUN: %clang -target sparc--netbsd -m32 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "sparc--netbsd"' %t + +// RUN: %clang -target sparc--netbsd -m64 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "sparcv9--netbsd"' %t + +// RUN: %clang -target mips64--netbsd -m32 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "mips--netbsd"' %t + +// RUN: %clang -target mips64--netbsd -m64 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "mips64--netbsd"' %t + +// RUN: %clang -target mips--netbsd -m32 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "mips--netbsd"' %t + +// RUN: %clang -target mips--netbsd -m64 %s -### 2> %t +// RUN: grep '"-cc1" "-triple" "mips64--netbsd"' %t |
