[llvm-branch-commits] [cfe-branch] r206783 - Revert "Merging r198940:"
Tom Stellard
thomas.stellard at amd.com
Mon Apr 21 13:30:27 PDT 2014
Author: tstellar
Date: Mon Apr 21 15:30:27 2014
New Revision: 206783
URL: http://llvm.org/viewvc/llvm-project?rev=206783&view=rev
Log:
Revert "Merging r198940:"
This reverts commit r206064.
This commit regressed the MultiSource/Applications/sgefa/sgefa test.
Modified:
cfe/branches/release_34/lib/Driver/Driver.cpp
cfe/branches/release_34/lib/Driver/ToolChains.cpp
cfe/branches/release_34/lib/Driver/ToolChains.h
cfe/branches/release_34/test/Driver/constructors.c
Modified: cfe/branches/release_34/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Driver/Driver.cpp?rev=206783&r1=206782&r2=206783&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Driver/Driver.cpp (original)
+++ cfe/branches/release_34/lib/Driver/Driver.cpp Mon Apr 21 15:30:27 2014
@@ -1981,10 +1981,6 @@ const ToolChain &Driver::getToolChain(co
TC = new toolchains::XCore(*this, Target, Args);
break;
}
- if (Target.isOSBinFormatELF()) {
- TC = new toolchains::Generic_ELF(*this, Target, Args);
- break;
- }
TC = new toolchains::Generic_GCC(*this, Target, Args);
break;
}
Modified: cfe/branches/release_34/lib/Driver/ToolChains.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Driver/ToolChains.cpp?rev=206783&r1=206782&r2=206783&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Driver/ToolChains.cpp (original)
+++ cfe/branches/release_34/lib/Driver/ToolChains.cpp Mon Apr 21 15:30:27 2014
@@ -1622,21 +1622,6 @@ bool Generic_GCC::isPICDefaultForced() c
return false;
}
-void Generic_ELF::addClangTargetOptions(const ArgList &DriverArgs,
- ArgStringList &CC1Args) const {
- const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion();
- bool UseInitArrayDefault =
- getTriple().getArch() == llvm::Triple::aarch64 ||
- (getTriple().getOS() == llvm::Triple::Linux && (
- !V.isOlderThan(4, 7, 0) ||
- getTriple().getEnvironment() == llvm::Triple::Android));
-
- if (DriverArgs.hasFlag(options::OPT_fuse_init_array,
- options::OPT_fno_use_init_array,
- UseInitArrayDefault))
- CC1Args.push_back("-fuse-init-array");
-}
-
/// Hexagon Toolchain
std::string Hexagon_TC::GetGnuDir(const std::string &InstalledDir) {
@@ -2551,6 +2536,19 @@ Tool *Linux::buildAssembler() const {
return new tools::gnutools::Assemble(*this);
}
+void Linux::addClangTargetOptions(const ArgList &DriverArgs,
+ ArgStringList &CC1Args) const {
+ const Generic_GCC::GCCVersion &V = GCCInstallation.getVersion();
+ bool UseInitArrayDefault =
+ !V.isOlderThan(4, 7, 0) ||
+ getTriple().getArch() == llvm::Triple::aarch64 ||
+ getTriple().getEnvironment() == llvm::Triple::Android;
+ if (DriverArgs.hasFlag(options::OPT_fuse_init_array,
+ options::OPT_fno_use_init_array,
+ UseInitArrayDefault))
+ CC1Args.push_back("-fuse-init-array");
+}
+
std::string Linux::computeSysRoot() const {
if (!getDriver().SysRoot.empty())
return getDriver().SysRoot;
Modified: cfe/branches/release_34/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/lib/Driver/ToolChains.h?rev=206783&r1=206782&r2=206783&view=diff
==============================================================================
--- cfe/branches/release_34/lib/Driver/ToolChains.h (original)
+++ cfe/branches/release_34/lib/Driver/ToolChains.h Mon Apr 21 15:30:27 2014
@@ -427,8 +427,12 @@ public:
const llvm::opt::ArgList &Args)
: Generic_GCC(D, Triple, Args) {}
- virtual void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
- llvm::opt::ArgStringList &CC1Args) const;
+ virtual bool IsIntegratedAssemblerDefault() const {
+ // Default integrated assembler to on for x86.
+ return (getTriple().getArch() == llvm::Triple::aarch64 ||
+ getTriple().getArch() == llvm::Triple::x86 ||
+ getTriple().getArch() == llvm::Triple::x86_64);
+ }
};
class LLVM_LIBRARY_VISIBILITY AuroraUX : public Generic_GCC {
@@ -575,6 +579,8 @@ public:
virtual void
AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const;
+ virtual void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,
+ llvm::opt::ArgStringList &CC1Args) const;
virtual void
AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,
llvm::opt::ArgStringList &CC1Args) const;
Modified: cfe/branches/release_34/test/Driver/constructors.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/test/Driver/constructors.c?rev=206783&r1=206782&r2=206783&view=diff
==============================================================================
--- cfe/branches/release_34/test/Driver/constructors.c (original)
+++ cfe/branches/release_34/test/Driver/constructors.c Mon Apr 21 15:30:27 2014
@@ -46,12 +46,3 @@
// RUN: -target i386-unknown-linux-android \
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
-//
-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
-// RUN: -target aarch64-none-linux-gnu \
-// RUN: --sysroot=%S/Inputs/basic_linux_tree \
-// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
-//
-// RUN: %clang -no-canonical-prefixes %s -### -fsyntax-only 2>&1 \
-// RUN: -target aarch64-none-none-eabi \
-// RUN: | FileCheck --check-prefix=CHECK-INIT-ARRAY %s
More information about the llvm-branch-commits
mailing list