shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Revert "Use the integrated assembler by default on 32-bit PowerPC and SPARC"

Browse Source 
This reverts commit r225212.  It's failing on multiple buildbots [1][2].

[1]: http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/22032
[2]: http://lab.llvm.org:8080/green/view/Clang/job/clang-stage1-cmake-RA-incremental_check/2357/

llvm-svn: 225221
This commit is contained in:
Duncan P. N. Exon Smith 2015-01-05 23:31:42 +00:00
parent f93f56d619
commit 0aa050fbf2
4 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/Driver/ToolChains.cpp
View File

@ -2067,11 +2067,8 @@ bool Generic_GCC::IsIntegratedAssemblerDefault() const {
getTriple().getArch() == llvm::Triple::armeb ||
getTriple().getArch() == llvm::Triple::thumb ||
getTriple().getArch() == llvm::Triple::thumbeb ||
getTriple().getArch() == llvm::Triple::ppc ||
getTriple().getArch() == llvm::Triple::ppc64 ||
getTriple().getArch() == llvm::Triple::ppc64le ||
getTriple().getArch() == llvm::Triple::sparc ||
getTriple().getArch() == llvm::Triple::sparcv9 ||
getTriple().getArch() == llvm::Triple::systemz;
}

27
clang/lib/Driver/ToolChains.h
View File

@ -534,6 +534,17 @@ public:
return 2;
}
virtual bool IsIntegratedAssemblerDefault() const override {
switch (getTriple().getArch()) {
case llvm::Triple::ppc:
case llvm::Triple::sparc:
case llvm::Triple::sparcv9:
return true;
default:
return Generic_ELF::IsIntegratedAssemblerDefault();
}
}
protected:
Tool *buildAssembler() const override;
Tool *buildLinker() const override;
@ -575,6 +586,14 @@ public:
void
AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const override;
bool IsIntegratedAssemblerDefault() const override {
switch (getTriple().getArch()) {
case llvm::Triple::ppc:
return true;
default:
return Generic_ELF::IsIntegratedAssemblerDefault();
}
}
bool UseSjLjExceptions() const override;
bool isPIEDefault() const override;
@ -599,6 +618,14 @@ public:
bool IsUnwindTablesDefault() const override {
return true;
}
bool IsIntegratedAssemblerDefault() const override {
switch (getTriple().getArch()) {
case llvm::Triple::ppc:
return true;
default:
return Generic_ELF::IsIntegratedAssemblerDefault();
}
}
protected:
Tool *buildAssembler() const override;

4
clang/test/Driver/freebsd.c
View File

@ -128,11 +128,11 @@
// RUN: | FileCheck --check-prefix=CHECK-LTO %s
// CHECK-LTO: ld{{.*}}" "-plugin{{.*}}LLVMgold.so
// RUN: %clang -target sparc-unknown-freebsd8 %s -### -fpic -no-integrated-as 2>&1 \
// RUN: %clang -target sparc-unknown-freebsd8 %s -### -fpic 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-SPARC-PIE %s
// CHECK-SPARC-PIE: as{{.*}}" "-KPIC
// RUN: %clang -mcpu=ultrasparc -target sparc64-unknown-freebsd8 %s -### -no-integrated-as 2>&1 \
// RUN: %clang -mcpu=ultrasparc -target sparc64-unknown-freebsd8 %s -### 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-SPARC-CPU %s
// CHECK-SPARC-CPU: cc1{{.*}}" "-target-cpu" "ultrasparc"
// CHECK-SPARC-CPU: as{{.*}}" "-Av9a

4
clang/test/Driver/unknown-gcc-arch.c
View File

@ -24,11 +24,11 @@
// RUN: %clang -target powerpc64-unknown-unknown -c -x assembler %s -### -m32 \
// RUN: -no-integrated-as 2>&1 | FileCheck -check-prefix=PPC64-M32 %s
// RUN: 2>&1 | FileCheck -check-prefix=PPC64-M32 %s
// PPC64-M32: {{.*as.*-a32}}
// RUN: %clang -target powerpc-unknown-unknown -c -x assembler %s -### 2>&1 \
// RUN: -no-integrated-as | FileCheck -check-prefix=PPC %s
// RUN: | FileCheck -check-prefix=PPC %s
// PPC: {{.*as.*-a32}}
// RUN: %clang -target sparc64-unknown-unknown -no-integrated-as -c -x assembler %s -### -m32 2>&1 \