Commit 552fa444 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r198940 (second try): 

------------------------------------------------------------------------
r198940 | kristof.beyls | 2014-01-10 08:44:34 -0500 (Fri, 10 Jan 2014) | 2 lines

Enable -fuse-init-array for all AArch64 ELF targets by default, not just linux.

------------------------------------------------------------------------

llvm-svn: 207288
parent b534d242

clang/lib/Driver/ToolChains.cpp

+15 −13
Original line number Diff line number Diff line
@@ -1622,6 +1622,21 @@ bool Generic_GCC::isPICDefaultForced() const { 
  return false;

}



void Generic_GCC::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) {
@@ -2536,19 +2551,6 @@ 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;

clang/lib/Driver/ToolChains.h

+2 −2
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ public: 
  virtual bool isPICDefault() const;

  virtual bool isPIEDefault() const;

  virtual bool isPICDefaultForced() const;

  virtual void addClangTargetOptions(const llvm::opt::ArgList &DriverArgs,

                                     llvm::opt::ArgStringList &CC1Args) const;



protected:

  virtual Tool *getTool(Action::ActionClass AC) const;
@@ -579,8 +581,6 @@ 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;

clang/test/Driver/constructors.c

+9 −0
Original line number Diff line number Diff line
@@ -46,3 +46,12 @@ 
// 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