6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-09 11:25:55 +00:00
Code Issues Projects Releases Wiki Activity

Make NaCl's use of .init_array for static constructors match Linux

Browse Source 
Summary:
The generic ELF TargetObjectFile defaults to .ctors, but Linux's
defaults to .init_array by calling InitializeELF with the value of
UseInitArray from TargetMachine. Make NaCl's behavior match.

Reviewers: jvoung
Differential Revision: http://reviews.llvm.org/D8240

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231934 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Derek Schuff
2015-03-11 16:16:09 +00:00
parent 2175eac141
commit 87e6561f34
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Target/X86/X86TargetMachine.cpp
View File

@@ -37,8 +37,8 @@ static std::unique_ptr<TargetLoweringObjectFile> createTLOF(const Triple &TT) {
return make_unique<TargetLoweringObjectFileMachO>(); return make_unique<TargetLoweringObjectFileMachO>();
} }
if (TT.isOSLinux()) if (TT.isOSLinux() || TT.isOSNaCl())
return make_unique<X86LinuxTargetObjectFile>(); return make_unique<X86LinuxNaClTargetObjectFile>();
if (TT.isOSBinFormatELF()) if (TT.isOSBinFormatELF())
return make_unique<X86ELFTargetObjectFile>(); return make_unique<X86ELFTargetObjectFile>();
if (TT.isKnownWindowsMSVCEnvironment()) if (TT.isKnownWindowsMSVCEnvironment())

3
lib/Target/X86/X86TargetObjectFile.cpp
View File

@@ -66,7 +66,8 @@ const MCExpr *X86ELFTargetObjectFile::getDebugThreadLocalSymbol(
} }
void void
X86LinuxTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM) { X86LinuxNaClTargetObjectFile::Initialize(MCContext &Ctx,
const TargetMachine &TM) {
TargetLoweringObjectFileELF::Initialize(Ctx, TM); TargetLoweringObjectFileELF::Initialize(Ctx, TM);
InitializeELF(TM.Options.UseInitArray); InitializeELF(TM.Options.UseInitArray);
} }

6
lib/Target/X86/X86TargetObjectFile.h
View File

@@ -44,9 +44,9 @@ namespace llvm {
const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const override; const MCExpr *getDebugThreadLocalSymbol(const MCSymbol *Sym) const override;
}; };
/// X86LinuxTargetObjectFile - This implementation is used for linux x86 /// X86LinuxNaClTargetObjectFile - This implementation is used for linux and
/// and x86-64. /// Native Client on x86 and x86-64.
class X86LinuxTargetObjectFile : public X86ELFTargetObjectFile { class X86LinuxNaClTargetObjectFile : public X86ELFTargetObjectFile {
void Initialize(MCContext &Ctx, const TargetMachine &TM) override; void Initialize(MCContext &Ctx, const TargetMachine &TM) override;
}; };

8
test/CodeGen/X86/constructor.ll
View File

@@ -1,5 +1,6 @@
; RUN: llc -mtriple x86_64-pc-linux -use-ctors < %s | FileCheck --check-prefix=CTOR %s ; RUN: llc -mtriple x86_64-pc-linux -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-pc-linux < %s | FileCheck --check-prefix=INIT-ARRAY %s
; RUN: llc -mtriple x86_64-unknown-nacl < %s | FileCheck --check-prefix=NACL %s
@llvm.global_ctors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @f, i8* null}, { i32, void ()*, i8* } { i32 15, void ()* @g, i8* @v }] @llvm.global_ctors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @f, i8* null}, { i32, void ()*, i8* } { i32 15, void ()* @g, i8* @v }]
@v = weak_odr global i8 0 @v = weak_odr global i8 0
@@ -27,3 +28,10 @@ entry:
; INIT-ARRAY-NEXT: .section .init_array,"aw",@init_array ; INIT-ARRAY-NEXT: .section .init_array,"aw",@init_array
; INIT-ARRAY-NEXT: .align 8 ; INIT-ARRAY-NEXT: .align 8
; INIT-ARRAY-NEXT: .quad f ; INIT-ARRAY-NEXT: .quad f
; NACL: .section .init_array.15,"aGw",@init_array,v,comdat
; NACL-NEXT: .align 4
; NACL-NEXT: .long g
; NACL-NEXT: .section .init_array,"aw",@init_array
; NACL-NEXT: .align 4
; NACL-NEXT: .long f