maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Disable the fix for pr20793 because of a gnu ld bug. 

llvm-svn: 217211
This commit is contained in:
Rafael Espindola 2014-09-05 00:14:12 +00:00
parent ad464dbf0b
commit 7eb3b06ca2
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
View File

@ -31,6 +31,7 @@
#include "llvm/MC/MCSectionMachO.h"
#include "llvm/MC/MCStreamer.h"
#include "llvm/MC/MCSymbol.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Dwarf.h"
#include "llvm/Support/ELF.h"
#include "llvm/Support/ErrorHandling.h"
@ -41,6 +42,13 @@
using namespace llvm;
using namespace dwarf;
// Disabled by default because it hits bug 17350 in GNU ld (gold is fine)
static cl::opt<bool>
EnableStructorCOMDAT("enable-structor-comdat", cl::Hidden,
cl::desc("Use comdats to keep only one copy of a "
"constructor/destructor invocation"),
cl::init(false));
//===----------------------------------------------------------------------===//
// ELF
//===----------------------------------------------------------------------===//
@ -363,6 +371,9 @@ static const MCSectionELF *getStaticStructorSection(MCContext &Ctx,
bool IsCtor,
unsigned Priority,
const MCSymbol *KeySym) {
if (!EnableStructorCOMDAT)
KeySym = nullptr;
std::string Name;
unsigned Type;
unsigned Flags = ELF::SHF_ALLOC | ELF::SHF_WRITE;

21
llvm/test/CodeGen/X86/constructor.ll
View File

@ -1,5 +1,8 @@
; RUN: llc -mtriple x86_64-pc-linux -use-ctors -enable-structor-comdat < %s | FileCheck --check-prefix=CTOR-COMDAT %s
; RUN: llc -mtriple x86_64-pc-linux -enable-structor-comdat < %s | FileCheck --check-prefix=INIT-ARRAY-COMDAT %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
@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
@ -14,16 +17,30 @@ entry:
ret void
}
; CTOR: .section .ctors.65520,"aGw",@progbits,v,comdat
; CTOR: .section .ctors.65520,"aw",@progbits
; CTOR-NEXT: .align 8
; CTOR-NEXT: .quad g
; CTOR-NEXT: .section .ctors,"aw",@progbits
; CTOR-NEXT: .align 8
; CTOR-NEXT: .quad f
; INIT-ARRAY: .section .init_array.15,"aGw",@init_array,v,comdat
; INIT-ARRAY: .section .init_array.15,"aw",@init_array
; INIT-ARRAY-NEXT: .align 8
; INIT-ARRAY-NEXT: .quad g
; INIT-ARRAY-NEXT: .section .init_array,"aw",@init_array
; INIT-ARRAY-NEXT: .align 8
; INIT-ARRAY-NEXT: .quad f
; CTOR-COMDAT: .section .ctors.65520,"aGw",@progbits,v,comdat
; CTOR-COMDAT-NEXT: .align 8
; CTOR-COMDAT-NEXT: .quad g
; CTOR-COMDAT-NEXT: .section .ctors,"aw",@progbits
; CTOR-COMDAT-NEXT: .align 8
; CTOR-COMDAT-NEXT: .quad f
; INIT-ARRAY-COMDAT: .section .init_array.15,"aGw",@init_array,v,comdat
; INIT-ARRAY-COMDAT-NEXT: .align 8
; INIT-ARRAY-COMDAT-NEXT: .quad g
; INIT-ARRAY-COMDAT-NEXT: .section .init_array,"aw",@init_array
; INIT-ARRAY-COMDAT-NEXT: .align 8
; INIT-ARRAY-COMDAT-NEXT: .quad f