Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CodeGen] Sort .ctors in reverse on MinGW just like on other platforms #68570

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[CodeGen] Sort .ctors in reverse on MinGW just like on other platforms #68570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2807,7 +2807,11 @@ void AsmPrinter::emitXXStructorList(const DataLayout &DL, const Constant *List,

// Emit the structors in reverse order if we are using the .ctor/.dtor
// initialization scheme.
if (!TM.Options.UseInitArray)
bool UseCtorSection = !TM.Options.UseInitArray;
// MinGW targets always use the .ctors section.
if (TM.getTargetTriple().isWindowsGNUEnvironment())
UseCtorSection = true;
if (UseCtorSection)
std::reverse(Structors.begin(), Structors.end());

const Align Align = DL.getPointerPrefAlignment();
Expand Down
12 changes: 6 additions & 6 deletions llvm/test/CodeGen/X86/constructor.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ entry:
; MCU-CTORS: .section .ctors,"aw",@progbits
; MCU-INIT-ARRAY: .section .init_array,"aw",@init_array

; COFF-CTOR: .section .ctors.65520,"dw",associative,v
; COFF-CTOR: .section .ctors,"dw"
; COFF-CTOR-NEXT: .p2align 3
; COFF-CTOR-NEXT: .quad g
; COFF-CTOR-NEXT: .quad j
; COFF-CTOR-NEXT: .quad i
; COFF-CTOR-NEXT: .quad f
; 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: .section .ctors.65520,"dw",associative,v
; COFF-CTOR-NEXT: .p2align 3
; COFF-CTOR-NEXT: .quad f
; COFF-CTOR-NEXT: .quad i
; COFF-CTOR-NEXT: .quad j
; COFF-CTOR-NEXT: .quad g
4 changes: 2 additions & 2 deletions llvm/test/MC/COFF/global_ctors_dtors.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ define i32 @main() nounwind {
; WIN32-NOT: c_global_ctor
; WIN32: .section .CRT$XTX,"dr"
; WIN32: a_global_dtor
; MINGW32: .section .ctors,"dw"
; MINGW32: a_global_ctor
; MINGW32: .section .ctors,"dw",associative,{{_?}}b
; MINGW32: b_global_ctor
; MINGW32-NOT: c_global_ctor
; MINGW32: .section .ctors,"dw"
; MINGW32: a_global_ctor
; MINGW32: .section .dtors,"dw"
; MINGW32: a_global_dtor