mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-18 19:06:44 +00:00
Code Issues Projects Releases Wiki Activity

[LLD][COFF] Infer subsystem from EC symbol table for ARM64X (#122838)

Browse Source
This commit is contained in:
Jacek Caban 2025-01-15 17:50:19 +01:00 committed by GitHub
parent 80084e9cb6
commit 0360f8170a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/COFF/Driver.cpp
View File

@ -2351,7 +2351,7 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
// and after the early return when just writing an import library.
if (config->subsystem == IMAGE_SUBSYSTEM_UNKNOWN) {
llvm::TimeTraceScope timeScope("Infer subsystem");
config->subsystem = ctx.symtab.inferSubsystem();
config->subsystem = mainSymtab.inferSubsystem();
if (config->subsystem == IMAGE_SUBSYSTEM_UNKNOWN)
Fatal(ctx) << "subsystem must be defined";
}

41
lld/test/COFF/subsystem-arm64x.test Normal file
View File

@ -0,0 +1,41 @@
REQUIRES: aarch64
RUN: split-file %s %t.dir && cd %t.dir
RUN: llvm-mc -filetype=obj -triple=arm64ec-windows main.s -o main-arm64ec.obj
RUN: llvm-mc -filetype=obj -triple=aarch64-windows main.s -o main-arm64.obj
RUN: llvm-mc -filetype=obj -triple=arm64ec-windows winmain.s -o winmain-arm64ec.obj
RUN: llvm-mc -filetype=obj -triple=aarch64-windows winmain.s -o winmain-arm64.obj
RUN: llvm-mc -filetype=obj -triple=arm64ec-windows %S/Inputs/loadconfig-arm64ec.s -o loadconfig-arm64ec.obj
RUN: llvm-mc -filetype=obj -triple=aarch64-windows %S/Inputs/loadconfig-arm64.s -o loadconfig-arm64.obj
Check that the subsystem is inferred from EC symbols.
RUN: lld-link -machine:arm64x -entry:entry -out:out.exe main-arm64.obj winmain-arm64ec.obj \
RUN: loadconfig-arm64.obj loadconfig-arm64ec.obj
RUN: llvm-readobj --headers out.exe | FileCheck --check-prefix=GUI %s
GUI: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI (0x2)
GUI: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI (0x2)
RUN: lld-link -machine:arm64x -entry:entry -out:out.exe main-arm64ec.obj winmain-arm64.obj \
RUN: loadconfig-arm64.obj loadconfig-arm64ec.obj
RUN: llvm-readobj --headers out.exe | FileCheck --check-prefix=CUI %s
CUI: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)
CUI: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI (0x3)
#--- main.s
.globl "#main"
.globl main
.globl entry
"#main":
main:
entry:
ret
#--- winmain.s
.globl "#WinMain"
.globl WinMain
.globl entry
"#WinMain":
WinMain:
entry:
ret