Author: joerg Date: Fri Nov 27 07:16:33 2015 New Revision: 254199 URL: http://llvm.org/viewvc/llvm-project?rev=254199&view=rev Log: Revert Sparc and SparcV9 to external assembler. Now that the CPU handling is corrected, the primary reason for forcing IAS as default is gone and the remaining issues are still somewhat problematic in common situations.
Modified: cfe/trunk/lib/Driver/ToolChains.cpp cfe/trunk/test/Driver/sparc-as.c cfe/trunk/test/Driver/sparcv9-as.c Modified: cfe/trunk/lib/Driver/ToolChains.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=254199&r1=254198&r2=254199&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains.cpp Fri Nov 27 07:16:33 2015 @@ -2377,9 +2377,6 @@ bool Generic_GCC::IsIntegratedAssemblerD case llvm::Triple::ppc: case llvm::Triple::ppc64: case llvm::Triple::ppc64le: - case llvm::Triple::sparc: - case llvm::Triple::sparcel: - case llvm::Triple::sparcv9: case llvm::Triple::systemz: return true; default: Modified: cfe/trunk/test/Driver/sparc-as.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/sparc-as.c?rev=254199&r1=254198&r2=254199&view=diff ============================================================================== --- cfe/trunk/test/Driver/sparc-as.c (original) +++ cfe/trunk/test/Driver/sparc-as.c Fri Nov 27 07:16:33 2015 @@ -1,3 +1,17 @@ +// Make sure Sparc does not use the integrated assembler by default. + +// RUN: %clang -target sparc-linux -### -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix=NO-IAS %s + +// RUN: %clang -target sparc-linux -fintegrated-as -### -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix=IAS %s + +// RUN: %clang -target sparc-linux -fno-integrated-as -### -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix=NO-IAS %s + +// IAS-NOT: "-no-integrated-as" +// NO-IAS: "-no-integrated-as" + // RUN: %clang -no-canonical-prefixes -target sparc--netbsd \ // RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \ // RUN: | FileCheck -check-prefix=SPARC %s Modified: cfe/trunk/test/Driver/sparcv9-as.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/sparcv9-as.c?rev=254199&r1=254198&r2=254199&view=diff ============================================================================== --- cfe/trunk/test/Driver/sparcv9-as.c (original) +++ cfe/trunk/test/Driver/sparcv9-as.c Fri Nov 27 07:16:33 2015 @@ -1,3 +1,17 @@ +// Make sure SparcV9 does not use the integrated assembler by default. + +// RUN: %clang -target sparcv9-linux -### -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix=NO-IAS %s + +// RUN: %clang -target sparcv9-linux -fintegrated-as -### -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix=IAS %s + +// RUN: %clang -target sparcv9-linux -fno-integrated-as -### -c %s 2>&1 \ +// RUN: | FileCheck -check-prefix=NO-IAS %s + +// IAS-NOT: "-no-integrated-as" +// NO-IAS: "-no-integrated-as" + // RUN: %clang -no-canonical-prefixes -target sparcv9--netbsd \ // RUN: -no-integrated-as --sysroot=%S/Inputs/basic_netbsd_tree %s -### 2>&1 \ // RUN: | FileCheck -check-prefix=SPARC %s _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits