<div dir="ltr">Nice! This change was super easy. We still need to handle @llvm.global_ctors in LTO, though.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Sep 5, 2014 at 11:03 AM, Rafael Espindola <span dir="ltr"><<a href="mailto:rafael.espindola@gmail.com" target="_blank">rafael.espindola@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Fri Sep 5 13:03:38 2014<br>
New Revision: 217264<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=217264&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=217264&view=rev</a><br>
Log:<br>
Revert "Disable the fix for pr20793 because of a gnu ld bug."<br>
<br>
This reverts commit r217211.<br>
<br>
Both the bfd ld and gold outputs were valid. They were using a Rela relocation,<br>
so the value present in the relocated location was not used, which caused me<br>
to misread the output.<br>
<br>
Modified:<br>
llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp<br>
llvm/trunk/test/CodeGen/X86/constructor.ll<br>
<br>
Modified: llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=217264&r1=217263&r2=217264&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp?rev=217264&r1=217263&r2=217264&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp (original)<br>
+++ llvm/trunk/lib/CodeGen/TargetLoweringObjectFileImpl.cpp Fri Sep 5 13:03:38 2014<br>
@@ -31,7 +31,6 @@<br>
#include "llvm/MC/MCSectionMachO.h"<br>
#include "llvm/MC/MCStreamer.h"<br>
#include "llvm/MC/MCSymbol.h"<br>
-#include "llvm/Support/CommandLine.h"<br>
#include "llvm/Support/Dwarf.h"<br>
#include "llvm/Support/ELF.h"<br>
#include "llvm/Support/ErrorHandling.h"<br>
@@ -42,13 +41,6 @@<br>
using namespace llvm;<br>
using namespace dwarf;<br>
<br>
-// Disabled by default because it hits bug 17350 in GNU ld (gold is fine)<br>
-static cl::opt<bool><br>
- EnableStructorCOMDAT("enable-structor-comdat", cl::Hidden,<br>
- cl::desc("Use comdats to keep only one copy of a "<br>
- "constructor/destructor invocation"),<br>
- cl::init(false));<br>
-<br>
//===----------------------------------------------------------------------===//<br>
// ELF<br>
//===----------------------------------------------------------------------===//<br>
@@ -371,9 +363,6 @@ static const MCSectionELF *getStaticStru<br>
bool IsCtor,<br>
unsigned Priority,<br>
const MCSymbol *KeySym) {<br>
- if (!EnableStructorCOMDAT)<br>
- KeySym = nullptr;<br>
-<br>
std::string Name;<br>
unsigned Type;<br>
unsigned Flags = ELF::SHF_ALLOC | ELF::SHF_WRITE;<br>
<br>
Modified: llvm/trunk/test/CodeGen/X86/constructor.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/constructor.ll?rev=217264&r1=217263&r2=217264&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/constructor.ll?rev=217264&r1=217263&r2=217264&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/CodeGen/X86/constructor.ll (original)<br>
+++ llvm/trunk/test/CodeGen/X86/constructor.ll Fri Sep 5 13:03:38 2014<br>
@@ -1,8 +1,5 @@<br>
-; RUN: llc -mtriple x86_64-pc-linux -use-ctors -enable-structor-comdat < %s | FileCheck --check-prefix=CTOR-COMDAT %s<br>
-; RUN: llc -mtriple x86_64-pc-linux -enable-structor-comdat < %s | FileCheck --check-prefix=INIT-ARRAY-COMDAT %s<br>
; RUN: llc -mtriple x86_64-pc-linux -use-ctors < %s | FileCheck --check-prefix=CTOR %s<br>
; RUN: llc -mtriple x86_64-pc-linux < %s | FileCheck --check-prefix=INIT-ARRAY %s<br>
-<br>
@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 }]<br>
<br>
@v = weak_odr global i8 0<br>
@@ -17,30 +14,16 @@ entry:<br>
ret void<br>
}<br>
<br>
-; CTOR: .section .ctors.65520,"aw",@progbits<br>
+; CTOR: .section .ctors.65520,"aGw",@progbits,v,comdat<br>
; CTOR-NEXT: .align 8<br>
; CTOR-NEXT: .quad g<br>
; CTOR-NEXT: .section .ctors,"aw",@progbits<br>
; CTOR-NEXT: .align 8<br>
; CTOR-NEXT: .quad f<br>
<br>
-; INIT-ARRAY: .section .init_array.15,"aw",@init_array<br>
+; INIT-ARRAY: .section .init_array.15,"aGw",@init_array,v,comdat<br>
; INIT-ARRAY-NEXT: .align 8<br>
; INIT-ARRAY-NEXT: .quad g<br>
; INIT-ARRAY-NEXT: .section .init_array,"aw",@init_array<br>
; INIT-ARRAY-NEXT: .align 8<br>
; INIT-ARRAY-NEXT: .quad f<br>
-<br>
-; CTOR-COMDAT: .section .ctors.65520,"aGw",@progbits,v,comdat<br>
-; CTOR-COMDAT-NEXT: .align 8<br>
-; CTOR-COMDAT-NEXT: .quad g<br>
-; CTOR-COMDAT-NEXT: .section .ctors,"aw",@progbits<br>
-; CTOR-COMDAT-NEXT: .align 8<br>
-; CTOR-COMDAT-NEXT: .quad f<br>
-<br>
-; INIT-ARRAY-COMDAT: .section .init_array.15,"aGw",@init_array,v,comdat<br>
-; INIT-ARRAY-COMDAT-NEXT: .align 8<br>
-; INIT-ARRAY-COMDAT-NEXT: .quad g<br>
-; INIT-ARRAY-COMDAT-NEXT: .section .init_array,"aw",@init_array<br>
-; INIT-ARRAY-COMDAT-NEXT: .align 8<br>
-; INIT-ARRAY-COMDAT-NEXT: .quad f<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>