1Pull in r199012 from upstream clang trunk (by Jakob Stoklund Olesen): 2 3 Select the UltraSPARC instruction set when invoking the assembler. 4 5Introduced here: http://svn.freebsd.org/changeset/base/262262 6 7Index: tools/clang/lib/Driver/Tools.cpp 8=================================================================== 9--- tools/clang/lib/Driver/Tools.cpp 10+++ tools/clang/lib/Driver/Tools.cpp 11@@ -6228,8 +6228,10 @@ void gnutools::Assemble::ConstructJob(Compilation 12 CmdArgs.push_back("-many"); 13 } else if (getToolChain().getArch() == llvm::Triple::sparc) { 14 CmdArgs.push_back("-32"); 15+ CmdArgs.push_back("-Av8plusa"); 16 } else if (getToolChain().getArch() == llvm::Triple::sparcv9) { 17 CmdArgs.push_back("-64"); 18+ CmdArgs.push_back("-Av9a"); 19 } else if (getToolChain().getArch() == llvm::Triple::arm) { 20 StringRef MArch = getToolChain().getArchName(); 21 if (MArch == "armv7" || MArch == "armv7a" || MArch == "armv7-a") 22Index: tools/clang/test/Driver/linux-as.c 23=================================================================== 24--- tools/clang/test/Driver/linux-as.c 25+++ tools/clang/test/Driver/linux-as.c 26@@ -65,6 +65,7 @@ 27 // RUN: | FileCheck -check-prefix=CHECK-SPARCV9 %s 28 // CHECK-SPARCV9: as 29 // CHECK-SPARCV9: -64 30+// CHECK-SPARCV9: -Av9a 31 // CHECK-SPARCV9: -o 32 // 33 // RUN: %clang -target sparc-linux -mcpu=invalid-cpu -### \ 34@@ -72,6 +73,7 @@ 35 // RUN: | FileCheck -check-prefix=CHECK-SPARCV8 %s 36 // CHECK-SPARCV8: as 37 // CHECK-SPARCV8: -32 38+// CHECK-SPARCV8: -Av8plusa 39 // CHECK-SPARCV8: -o 40 // 41 // RUN: %clang -target s390x-linux -### -no-integrated-as -c %s 2>&1 \ 42