mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-04-05 01:31:05 +00:00
Revert "Disable the fix for pr20793 because of a gnu ld bug."
This reverts commit r217211. Both the bfd ld and gold outputs were valid. They were using a Rela relocation, so the value present in the relocated location was not used, which caused me to misread the output. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217264 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
9f1eb4d913
commit
eaa85e2027
@ -31,7 +31,6 @@
|
||||
#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"
|
||||
@ -42,13 +41,6 @@
|
||||
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
|
||||
//===----------------------------------------------------------------------===//
|
||||
@ -371,9 +363,6 @@ 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;
|
||||
|
@ -1,8 +1,5 @@
|
||||
; 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
|
||||
@ -17,30 +14,16 @@ entry:
|
||||
ret void
|
||||
}
|
||||
|
||||
; CTOR: .section .ctors.65520,"aw",@progbits
|
||||
; CTOR: .section .ctors.65520,"aGw",@progbits,v,comdat
|
||||
; 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,"aw",@init_array
|
||||
; INIT-ARRAY: .section .init_array.15,"aGw",@init_array,v,comdat
|
||||
; 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
|
||||
|
Loading…
x
Reference in New Issue
Block a user