Commit 18959c31 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r198940: 

------------------------------------------------------------------------
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: 206064
parent 7ed7738a

clang/lib/Driver/Driver.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1981,6 +1981,10 @@ const ToolChain &Driver::getToolChain(const ArgList &Args, 
        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;

    }

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_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) {
@@ -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 −8
Original line number Diff line number Diff line
@@ -427,12 +427,8 @@ public: 
              const llvm::opt::ArgList &Args)

      : Generic_GCC(D, Triple, Args) {}



  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);

  }

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

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

};



class LLVM_LIBRARY_VISIBILITY AuroraUX : public Generic_GCC {
@@ -579,8 +575,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