Honor -fuse-init-array when os is not specified on x86

[kamleshbhalui]

Summary

Currently -fuse-init-array option is not effective when target triple does not specify os, on x86,x86_64.
i.e.
$clang -target i386 -fuse-init-array test.c -S // -fuse-init-array is not honored.

$clang -target i386-linux -fuse-init-array test.c -S // -fuse-init-array is honored.

This patch fixes first case.
And does cleanup.

[craig.topper]

Is it possible to add a test for this?

[kamleshbhalui]

@craig.topper Thanks for reviewing.
I have added a test.

[rnk]

It looks to me as if essentially all ELF targets want to honor the UseInitArray target option:

llvm/lib/Target/AArch64/AArch64TargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/Hexagon/HexagonTargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/Lanai/LanaiTargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/Mips/MipsTargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/RISCV/RISCVTargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/Sparc/SparcTargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/X86/X86TargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/X86/X86TargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/X86/X86TargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);
llvm/lib/Target/X86/X86TargetObjectFile.cpp:  InitializeELF(TM.Options.UseInitArray);

I think the code would be cleaner if we:

• hoisted that setting up into some shared base class
• OSs that insist on using ctors and not honoring this flag should be specialized to disable it (maybe NetBSD from your patch?)

What's needed here to prevent this type of problem in the future is a cleanup to reduce needlessly duplicated functionality, not yet another special case for OS-less triples.

llvm/lib/Target/X86/X86TargetObjectFile.h

52

I don't see how this differs in behavior in a meaningful way from X86ELFTargetObjectFile. Can you add the override there without breaking too much?

[craig.topper]

llvm/test/CodeGen/X86/init-array.ll

1 ↗

(On Diff #233397)

Would adding this RUN line to the existing constructors.ll be enough to test this?

[kamleshbhalui]

moved common code outside of target.
and added and modified checks.

[rnk]

So, this will lead to llc using .init_array by default, because llc doesn't know which ELF targets default to ctors, but clang does. See @MaskRay's clang change. I'm OK with that.

This looks good to me, but I would like to get a second approval from any of the other listed reviewers.

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

93

This whitespace change seems unnecessary, this is not a function doc comment, there should be a blank line here.

llvm/lib/Target/X86/X86TargetObjectFile.h

52

Oh, wow, what a simplification. :)

[kamleshbhalui]

Formatted and rebased.

[hctim]

Reverted in 2423774cc2a040d34d32aacaf261805cb195ebd2 due to breaking the sanitizer buildbots: http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/37410

Please see https://github.com/google/sanitizers/wiki/SanitizerBotReproduceBuild for more information about how to repro our buildbots (MSan in particular is tricky).

-- Testing: 34896 tests, 64 workers --
Testing:  0.. 10.. 20.. 30
FAIL: LLVM :: CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir (12314 of 34896)
******************** TEST 'LLVM :: CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir' FAILED ********************
Script:
--
: 'RUN: at line 1';   /b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/llc -march=x86-64 -run-pass none -o - /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir | /b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/FileCheck /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir
--
Exit Code: 2

Command Output (stderr):
--
invalid subroutine type
!6 = distinct !DISubprogram(name: "test", scope: !7, file: !7, line: 4, type: !2, scopeLine: 4, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
!2 = !{}
warning: ignoring invalid debug info in /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir
/b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/include/llvm/MC/MCObjectFileInfo.h:399:50: runtime error: load of value 2037605229, which is not a valid value for type 'llvm::MCObjectFileInfo::Environment'
    #0 0x265ffd6 in getObjectFileType /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/include/llvm/MC/MCObjectFileInfo.h:399:50
    #1 0x265ffd6 in llvm::MCContext::createSymbolImpl(llvm::StringMapEntry<bool> const*, bool) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/MC/MCContext.cpp:162:19
    #2 0x265f927 in llvm::MCContext::createSymbol(llvm::StringRef, bool, bool) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/MC/MCContext.cpp:205:14
    #3 0x265f4bc in llvm::MCContext::getOrCreateSymbol(llvm::Twine const&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/MC/MCContext.cpp:138:11
    #4 0x26fdced in (anonymous namespace)::MIParser::getOrCreateMCSymbol(llvm::StringRef) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:3058:26
    #5 0x26f89bd in (anonymous namespace)::MIParser::parsePreOrPostInstrSymbol(llvm::MCSymbol*&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:2956:12
    #6 0x26f4d02 in (anonymous namespace)::MIParser::parse(llvm::MachineInstr*&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:931:9
    #7 0x26f0a18 in parseBasicBlock /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:814:9
    #8 0x26f0a18 in parseBasicBlocks /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:876:9
    #9 0x26f0a18 in llvm::parseMachineInstructions(llvm::PerFunctionMIParsingState&, llvm::StringRef, llvm::SMDiagnostic&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:3077:36
    #10 0x27030d1 in llvm::MIRParserImpl::initializeMachineFunction(llvm::yaml::MachineFunction const&, llvm::MachineFunction&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIRParser.cpp:451:7
    #11 0x27029fd in llvm::MIRParserImpl::parseMachineFunction(llvm::Module&, llvm::MachineModuleInfo&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIRParser.cpp:300:7
    #12 0x270268d in llvm::MIRParserImpl::parseMachineFunctions(llvm::Module&, llvm::MachineModuleInfo&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIRParser.cpp:251:9
    #13 0x862a74 in compileModule(char**, llvm::LLVMContext&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/tools/llc/llc.cpp:584:16
    #14 0x8600bb in main /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/tools/llc/llc.cpp:356:22
    #15 0x7fae45e532e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0)
    #16 0x842f89 in _start (/b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/llc+0x842f89)

SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/include/llvm/MC/MCObjectFileInfo.h:399:50 in 
FileCheck error: '-' is empty.
FileCheck command line:  /b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/FileCheck /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir

--

********************
Testing:  0.. 10.. 20.. 30.. 40.. 50
FAIL: LLVM :: CodeGen/X86/instr-symbols.mir (18443 of 34896)
******************** TEST 'LLVM :: CodeGen/X86/instr-symbols.mir' FAILED ********************
Script:
--
: 'RUN: at line 1';   /b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/llc -mtriple=x86_64-unknown-linux -start-before=x86-flags-copy-lowering -o - /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/CodeGen/X86/instr-symbols.mir | /b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/FileCheck /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/CodeGen/X86/instr-symbols.mir
--
Exit Code: 2

Command Output (stderr):
--
/b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/include/llvm/MC/MCObjectFileInfo.h:399:50: runtime error: load of value 175335265, which is not a valid value for type 'llvm::MCObjectFileInfo::Environment'
    #0 0x265ffd6 in getObjectFileType /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/include/llvm/MC/MCObjectFileInfo.h:399:50
    #1 0x265ffd6 in llvm::MCContext::createSymbolImpl(llvm::StringMapEntry<bool> const*, bool) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/MC/MCContext.cpp:162:19
    #2 0x265f927 in llvm::MCContext::createSymbol(llvm::StringRef, bool, bool) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/MC/MCContext.cpp:205:14
    #3 0x265f4bc in llvm::MCContext::getOrCreateSymbol(llvm::Twine const&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/MC/MCContext.cpp:138:11
    #4 0x26fdced in (anonymous namespace)::MIParser::getOrCreateMCSymbol(llvm::StringRef) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:3058:26
    #5 0x26f89bd in (anonymous namespace)::MIParser::parsePreOrPostInstrSymbol(llvm::MCSymbol*&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:2956:12
    #6 0x26f4d02 in (anonymous namespace)::MIParser::parse(llvm::MachineInstr*&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:931:9
    #7 0x26f0a18 in parseBasicBlock /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:814:9
    #8 0x26f0a18 in parseBasicBlocks /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:876:9
    #9 0x26f0a18 in llvm::parseMachineInstructions(llvm::PerFunctionMIParsingState&, llvm::StringRef, llvm::SMDiagnostic&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIParser.cpp:3077:36
    #10 0x27030d1 in llvm::MIRParserImpl::initializeMachineFunction(llvm::yaml::MachineFunction const&, llvm::MachineFunction&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIRParser.cpp:451:7
    #11 0x27029fd in llvm::MIRParserImpl::parseMachineFunction(llvm::Module&, llvm::MachineModuleInfo&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIRParser.cpp:300:7
    #12 0x270268d in llvm::MIRParserImpl::parseMachineFunctions(llvm::Module&, llvm::MachineModuleInfo&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/lib/CodeGen/MIRParser/MIRParser.cpp:251:9
    #13 0x862a74 in compileModule(char**, llvm::LLVMContext&) /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/tools/llc/llc.cpp:584:16
    #14 0x8600bb in main /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/tools/llc/llc.cpp:356:22
    #15 0x7f6c4b2bc2e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0)
    #16 0x842f89 in _start (/b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/llc+0x842f89)

SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/include/llvm/MC/MCObjectFileInfo.h:399:50 in 
FileCheck error: '-' is empty.
FileCheck command line:  /b/sanitizer-x86_64-linux-fast/build/llvm_build_ubsan/bin/FileCheck /b/sanitizer-x86_64-linux-fast/build/llvm-project/llvm/test/CodeGen/X86/instr-symbols.mir

--

********************
Testing:  0.. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. 

Testing Time: 155.11s
********************
Failing Tests (2):
    LLVM :: CodeGen/MIR/X86/instr-symbols-and-mcsymbol-operands.mir
    LLVM :: CodeGen/X86/instr-symbols.mir

  Expected Passes    : 34301
  Expected Failures  : 149
  Unsupported Tests  : 444
  Unexpected Failures: 2
FAILED: test/CMakeFiles/check-llvm

[rnk]

I was able to reproduce this, but I think the issue is pre-existing. It looks like llc never calls TargetObjectFileInfo::Initialize when doing MIR parsing, but it probably should. The constructor of MCObjectFileInfo leaves the Env uninitialized, because it doesn't have the triple yet. The easiest way to observe the failure is with ubsan, since MSan is difficult to set up. I don't plan to debug this any further.

llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp

if (Key == "Objective-C Image Info Version") {
       Section = cast<MDString>(MFE.Val)->getString();
     }
   }
 }
 
 //===----------------------------------------------------------------------===//
 //                                  ELF
 //===----------------------------------------------------------------------===//
 
 void TargetLoweringObjectFileELF::Initialize(MCContext &Ctx,
                                              const TargetMachine &TgtM) {
   TargetLoweringObjectFile::Initialize(Ctx, TgtM);
   TM = &TgtM;
 
   CodeModel::Model CM = TgtM.getCodeModel();
+  InitializeELF(TgtM.Options.UseInitArray);
 
   switch (TgtM.getTargetTriple().getArch()) {
   case Triple::arm:
   case Triple::armeb:
   case Triple::thumb:
   case Triple::thumbeb:
     if (Ctx.getAsmInfo()->getExceptionHandlingType() == ExceptionHandling::ARM)
       break;

llvm/lib/Target/AArch64/AArch64TargetObjectFile.cpp

 #include "llvm/MC/MCStreamer.h"
 #include "llvm/MC/MCValue.h"
 using namespace llvm;
 using namespace dwarf;
 
 void AArch64_ELFTargetObjectFile::Initialize(MCContext &Ctx,
                                              const TargetMachine &TM) {
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
   // AARCH64 ELF ABI does not define static relocation type for TLS offset
   // within a module.  Do not generate AT_location for TLS variables.
   SupportDebugThreadLocalLocation = false;
 }
 
 AArch64_MachoTargetObjectFile::AArch64_MachoTargetObjectFile()
   : TargetLoweringObjectFileMachO() {
   SupportGOTPCRelWithOffset = false;

llvm/lib/Target/Hexagon/HexagonTargetObjectFile.cpp

static const char *getSectionSuffixForSize(unsigned Size) {
   case 8:
     return ".8";
   }
 }
 
 void HexagonTargetObjectFile::Initialize(MCContext &Ctx,
       const TargetMachine &TM) {
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
 
   SmallDataSection =
     getContext().getELFSection(".sdata", ELF::SHT_PROGBITS,
                                ELF::SHF_WRITE | ELF::SHF_ALLOC |
                                ELF::SHF_HEX_GPREL);
   SmallBSSSection =
     getContext().getELFSection(".sbss", ELF::SHT_NOBITS,
                                ELF::SHF_WRITE | ELF::SHF_ALLOC |

llvm/lib/Target/Lanai/LanaiTargetObjectFile.cpp

 static cl::opt<unsigned> SSThreshold(
     "lanai-ssection-threshold", cl::Hidden,
     cl::desc("Small data and bss section threshold size (default=0)"),
     cl::init(0));
 
 void LanaiTargetObjectFile::Initialize(MCContext &Ctx,
                                        const TargetMachine &TM) {
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
 
   SmallDataSection = getContext().getELFSection(
       ".sdata", ELF::SHT_PROGBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC);
   SmallBSSSection = getContext().getELFSection(".sbss", ELF::SHT_NOBITS,
                                                ELF::SHF_WRITE | ELF::SHF_ALLOC);
 }
 
 // A address must be loaded from a small section if its size is less than the

llvm/lib/Target/Mips/MipsTargetObjectFile.cpp

 static cl::opt<bool>
 EmbeddedData("membedded-data", cl::Hidden,
              cl::desc("MIPS: Try to allocate variables in the following"
                       " sections if possible: .rodata, .sdata, .data ."),
              cl::init(false));
 
 void MipsTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM){
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
 
   SmallDataSection = getContext().getELFSection(
       ".sdata", ELF::SHT_PROGBITS,
       ELF::SHF_WRITE | ELF::SHF_ALLOC | ELF::SHF_MIPS_GPREL);
 
   SmallBSSSection = getContext().getELFSection(".sbss", ELF::SHT_NOBITS,
                                                ELF::SHF_WRITE | ELF::SHF_ALLOC |
                                                    ELF::SHF_MIPS_GPREL);

llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp

 #include "llvm/MC/MCSectionELF.h"
 
 using namespace llvm;
 
 void
 PPC64LinuxTargetObjectFile::
 Initialize(MCContext &Ctx, const TargetMachine &TM) {
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
 }
 
 MCSection *PPC64LinuxTargetObjectFile::SelectSectionForGlobal(
     const GlobalObject *GO, SectionKind Kind, const TargetMachine &TM) const {
   // Here override ReadOnlySection to DataRelROSection for PPC64 SVR4 ABI
   // when we have a constant that contains global relocations.  This is
   // necessary because of this ABI's handling of pointers to functions in
   // a shared library.  The address of a function is actually the address

llvm/lib/Target/RISCV/RISCVTargetObjectFile.cpp

 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCSectionELF.h"
 
 using namespace llvm;
 
 void RISCVELFTargetObjectFile::Initialize(MCContext &Ctx,
                                           const TargetMachine &TM) {
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
 
   SmallDataSection = getContext().getELFSection(
       ".sdata", ELF::SHT_PROGBITS, ELF::SHF_WRITE | ELF::SHF_ALLOC);
   SmallBSSSection = getContext().getELFSection(".sbss", ELF::SHT_NOBITS,
                                                ELF::SHF_WRITE | ELF::SHF_ALLOC);
 }
 
 // A address must be loaded from a small section if its size is less than the

llvm/lib/Target/Sparc/SparcTargetObjectFile.cpp

 #include "llvm/CodeGen/MachineModuleInfoImpls.h"
 #include "llvm/CodeGen/TargetLowering.h"
 
 using namespace llvm;
 
 void SparcELFTargetObjectFile::Initialize(MCContext &Ctx,
                                           const TargetMachine &TM) {
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
 }
 
 const MCExpr *SparcELFTargetObjectFile::getTTypeGlobalReference(
     const GlobalValue *GV, unsigned Encoding, const TargetMachine &TM,
     MachineModuleInfo *MMI, MCStreamer &Streamer) const {
 
   if (Encoding & dwarf::DW_EH_PE_pcrel) {
     MachineModuleInfoELF &ELFMMI = MMI->getObjFileInfo<MachineModuleInfoELF>();

llvm/lib/Target/X86/X86TargetMachine.cpp

 
 static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) {
   if (TT.isOSBinFormatMachO()) {
     if (TT.getArch() == Triple::x86_64)
       return std::make_unique<X86_64MachoTargetObjectFile>();
     return std::make_unique<TargetLoweringObjectFileMachO>();
   }
 
-  if (TT.isOSFreeBSD())
-    return std::make_unique<X86FreeBSDTargetObjectFile>();
-  if (TT.isOSLinux() || TT.isOSNaCl() || TT.isOSIAMCU())
-    return std::make_unique<X86LinuxNaClTargetObjectFile>();
-  if (TT.isOSSolaris())
-    return std::make_unique<X86SolarisTargetObjectFile>();
-  if (TT.isOSFuchsia())
-    return std::make_unique<X86FuchsiaTargetObjectFile>();
-  if (TT.isOSBinFormatELF())
-    return std::make_unique<X86ELFTargetObjectFile>();
   if (TT.isOSBinFormatCOFF())
     return std::make_unique<TargetLoweringObjectFileCOFF>();
-  llvm_unreachable("unknown subtarget type");
+  return std::make_unique<X86ELFTargetObjectFile>();
 }
 
 static std::string computeDataLayout(const Triple &TT) {
   // X86 is little endian
   std::string Ret = "e";
 
   Ret += DataLayout::getManglingComponent(TT);
   // X86 and x32 have 32 bit pointers.

llvm/lib/Target/X86/X86TargetObjectFile.h

namespace llvm {
 
   /// This implemenatation is used for X86 ELF targets that don't
   /// have a further specialization.
   class X86ELFTargetObjectFile : public TargetLoweringObjectFileELF {
   public:
     X86ELFTargetObjectFile() {
       PLTRelativeVariantKind = MCSymbolRefExpr::VK_PLT;
     }
-
+    void Initialize(MCContext &Ctx, const TargetMachine &TM) override;
     /// Describe a TLS variable address within debug info.
     const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const override;
   };
 
-  /// X86FreeBSDTargetObjectFile - This implementation is used for FreeBSD
-  /// on x86 and x86-64.
-  class X86FreeBSDTargetObjectFile : public X86ELFTargetObjectFile {
-    void Initialize(MCContext &Ctx, const TargetMachine &TM) override;
-  };
-
-  /// This implementation is used for Fuchsia on x86-64.
-  class X86FuchsiaTargetObjectFile : public X86ELFTargetObjectFile {
-    void Initialize(MCContext &Ctx, const TargetMachine &TM) override;
-  };
-
-  /// X86LinuxNaClTargetObjectFile - This implementation is used for linux and
-  /// Native Client on x86 and x86-64.
-  class X86LinuxNaClTargetObjectFile : public X86ELFTargetObjectFile {
-    void Initialize(MCContext &Ctx, const TargetMachine &TM) override;
-  };
-
-  /// This implementation is used for Solaris on x86/x86-64.
-  class X86SolarisTargetObjectFile : public X86ELFTargetObjectFile {
-    void Initialize(MCContext &Ctx, const TargetMachine &TM) override;
-  };
-
 } // end namespace llvm
 
 #endif

llvm/lib/Target/X86/X86TargetObjectFile.cpp

 }
 
 const MCExpr *X86ELFTargetObjectFile::getDebugThreadLocalSymbol(
     const MCSymbol *Sym) const {
   return MCSymbolRefExpr::create(Sym, MCSymbolRefExpr::VK_DTPOFF, getContext());
 }
 
 void
-X86FreeBSDTargetObjectFile::Initialize(MCContext &Ctx,
+X86ELFTargetObjectFile::Initialize(MCContext &Ctx,
                                        const TargetMachine &TM) {
   TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
-}
-
-void
-X86FuchsiaTargetObjectFile::Initialize(MCContext &Ctx,
-                                       const TargetMachine &TM) {
-  TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
-}
-
-void
-X86LinuxNaClTargetObjectFile::Initialize(MCContext &Ctx,
-                                         const TargetMachine &TM) {
-  TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
-}
-
-void X86SolarisTargetObjectFile::Initialize(MCContext &Ctx,
-                                            const TargetMachine &TM) {
-  TargetLoweringObjectFileELF::Initialize(Ctx, TM);
-  InitializeELF(TM.Options.UseInitArray);
 }

llvm/test/CodeGen/X86/constructor.ll

 ; RUN: llc -mtriple x86_64-pc-linux -use-ctors < %s | FileCheck --check-prefix=CTOR %s
 ; RUN: llc -mtriple x86_64-unknown-freebsd -use-ctors < %s | FileCheck --check-prefix=CTOR %s
 ; RUN: llc -mtriple x86_64-pc-solaris2.11 -use-ctors < %s | FileCheck --check-prefix=CTOR %s
 ; RUN: llc -mtriple x86_64-pc-linux < %s | FileCheck --check-prefix=INIT-ARRAY %s
 ; RUN: llc -mtriple x86_64-unknown-freebsd < %s | FileCheck --check-prefix=INIT-ARRAY %s
 ; RUN: llc -mtriple x86_64-pc-solaris2.11 < %s | FileCheck --check-prefix=INIT-ARRAY %s
 ; RUN: llc -mtriple x86_64-unknown-nacl < %s | FileCheck --check-prefix=NACL %s
 ; RUN: llc -mtriple i586-intel-elfiamcu -use-ctors < %s | FileCheck %s --check-prefix=MCU-CTORS
 ; RUN: llc -mtriple i586-intel-elfiamcu < %s | FileCheck %s --check-prefix=MCU-INIT-ARRAY
 ; RUN: llc -mtriple x86_64-win32-gnu < %s | FileCheck --check-prefix=COFF-CTOR %s
+; RUN: llc -mtriple x86_64 -use-ctors=false < %s | FileCheck %s
 @llvm.global_ctors = appending global [3 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @f, i8* null}, { i32, void ()*, i8* } { i32 15, void ()* @g, i8* @v }, { i32, void ()*, i8* } { i32 55555, void ()* @h, i8* @v }]
 
 @v = weak_odr global i8 0
 
 define void @f() {
 entry:
   ret void
 }

 ; COFF-CTOR-NEXT: .p2align  3
 ; COFF-CTOR-NEXT: .quad g
 ; COFF-CTOR-NEXT: .section  .ctors.09980,"dw",associative,v
 ; COFF-CTOR-NEXT: .p2align  3
 ; COFF-CTOR-NEXT: .quad h
 ; COFF-CTOR-NEXT: .section  .ctors,"dw"
 ; COFF-CTOR-NEXT: .p2align  3
 ; COFF-CTOR-NEXT: .quad f
+
+; CHECK: .init_array

llvm/test/CodeGen/X86/init-priority.ll

-; RUN: llc < %s -mtriple=x86_64-netbsd | FileCheck %s
+; RUN: llc < %s -mtriple=x86_64-netbsd -use-ctors | FileCheck %s
 
 ; Check that our compiler never emits global constructors
 ; inside the .init_array section when building for a non supported target.
 ; Because of this, the test depends on UseInitArray behavior under NetBSD
 ; as found in Generic_ELF::addClangTargetOptions().
 
 ; This is to workaround a Visual Studio bug which causes field
 ; UseInitArray to be left uninitialized instead of being