This is an archive of the discontinued LLVM Phabricator instance.

Differential D63248

[LLD] [COFF] Allow setting subsystem versions while inferring the subsystem type implicitly
ClosedPublic

Authored by mstorsjo on Jun 13 2019, 3:45 AM.

Details

Reviewers
ruiu
rnk
Commits
rGb20fefc89b85: [COFF] Allow setting subsystem versions while inferring the subsystem type…
rL363431: [COFF] Allow setting subsystem versions while inferring the subsystem type…
rLLD363431: [COFF] Allow setting subsystem versions while inferring the subsystem type…
Summary

Lead-up to a fix for PR42218.

Diff Detail

Event Timeline

mstorsjo created this revision.Jun 13 2019, 3:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 13 2019, 3:45 AM
mstorsjo retitled this revision from [COFF] Allow setting subsystem versions while inferring the subsystem type implicitly to [LLD] [COFF] Allow setting subsystem versions while inferring the subsystem type implicitly.Jun 13 2019, 3:45 AM
ruiu accepted this revision.Jun 14 2019, 6:32 AM

LGTM

This revision is now accepted and ready to land.Jun 14 2019, 6:32 AM
Closed by commit rL363431: [COFF] Allow setting subsystem versions while inferring the subsystem type… (authored by mstorsjo). · Explain WhyJun 14 2019, 10:47 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
COFF/
6 lines
test/
COFF/
4 lines
9 lines

Diff 204476

COFF/DriverUtils.cpp

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Linesvoid parseGuard(StringRef FullArg) {
} }
} }
// Parses a string in the form of "<subsystem>[,<integer>[.<integer>]]". // Parses a string in the form of "<subsystem>[,<integer>[.<integer>]]".
void parseSubsystem(StringRef Arg, WindowsSubsystem *Sys, uint32_t *Major, void parseSubsystem(StringRef Arg, WindowsSubsystem *Sys, uint32_t *Major,
uint32_t *Minor) { uint32_t *Minor) {
StringRef SysStr, Ver; StringRef SysStr, Ver;
std::tie(SysStr, Ver) = Arg.split(','); std::tie(SysStr, Ver) = Arg.split(',');
*Sys = StringSwitch<WindowsSubsystem>(SysStr.lower()) std::string SysStrLower = SysStr.lower();
*Sys = StringSwitch<WindowsSubsystem>(SysStrLower)
.Case("boot_application", IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION) .Case("boot_application", IMAGE_SUBSYSTEM_WINDOWS_BOOT_APPLICATION)
.Case("console", IMAGE_SUBSYSTEM_WINDOWS_CUI) .Case("console", IMAGE_SUBSYSTEM_WINDOWS_CUI)
.Case("default", IMAGE_SUBSYSTEM_UNKNOWN)
.Case("efi_application", IMAGE_SUBSYSTEM_EFI_APPLICATION) .Case("efi_application", IMAGE_SUBSYSTEM_EFI_APPLICATION)
.Case("efi_boot_service_driver", IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER) .Case("efi_boot_service_driver", IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER)
.Case("efi_rom", IMAGE_SUBSYSTEM_EFI_ROM) .Case("efi_rom", IMAGE_SUBSYSTEM_EFI_ROM)
.Case("efi_runtime_driver", IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER) .Case("efi_runtime_driver", IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER)
.Case("native", IMAGE_SUBSYSTEM_NATIVE) .Case("native", IMAGE_SUBSYSTEM_NATIVE)
.Case("posix", IMAGE_SUBSYSTEM_POSIX_CUI) .Case("posix", IMAGE_SUBSYSTEM_POSIX_CUI)
.Case("windows", IMAGE_SUBSYSTEM_WINDOWS_GUI) .Case("windows", IMAGE_SUBSYSTEM_WINDOWS_GUI)
.Default(IMAGE_SUBSYSTEM_UNKNOWN); .Default(IMAGE_SUBSYSTEM_UNKNOWN);
if (*Sys == IMAGE_SUBSYSTEM_UNKNOWN) if (*Sys == IMAGE_SUBSYSTEM_UNKNOWN && SysStrLower != "default")
fatal("unknown subsystem: " + SysStr); fatal("unknown subsystem: " + SysStr);
if (!Ver.empty()) if (!Ver.empty())
parseVersion(Ver, Major, Minor); parseVersion(Ver, Major, Minor);
} }
// Parse a string of the form of "<from>=<to>". // Parse a string of the form of "<from>=<to>".
// Results are directly written to Config. // Results are directly written to Config.
void parseAlternateName(StringRef S) { void parseAlternateName(StringRef S) {
▲ Show 20 Lines • Show All 757 Lines • Show Last 20 Lines

test/COFF/subsystem-inference.test

# RUN: sed -e s/ENTRYNAME/main/ %s | yaml2obj > %t.obj # RUN: sed -e s/ENTRYNAME/main/ %s | yaml2obj > %t.obj
# RUN: lld-link /out:%t.exe %t.obj # RUN: lld-link /out:%t.exe %t.obj
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s # RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s
# RUN: lld-link /out:%t.exe %t.obj /subsystem:default,6.0
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=MAIN %s
# RUN: sed s/ENTRYNAME/wmain/ %s | yaml2obj > %t.obj # RUN: sed s/ENTRYNAME/wmain/ %s | yaml2obj > %t.obj
# RUN: lld-link /out:%t.exe %t.obj # RUN: lld-link /out:%t.exe %t.obj
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WMAIN %s # RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WMAIN %s
# RUN: sed s/ENTRYNAME/WinMain/ %s | yaml2obj > %t.obj # RUN: sed s/ENTRYNAME/WinMain/ %s | yaml2obj > %t.obj
# RUN: lld-link /out:%t.exe %t.obj # RUN: lld-link /out:%t.exe %t.obj
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s # RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
# RUN: lld-link /out:%t.exe %t.obj /subsystem:default,6.0
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WINMAIN %s
# RUN: sed s/ENTRYNAME/wWinMain/ %s | yaml2obj > %t.obj # RUN: sed s/ENTRYNAME/wWinMain/ %s | yaml2obj > %t.obj
# RUN: lld-link /out:%t.exe %t.obj # RUN: lld-link /out:%t.exe %t.obj
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s # RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=WWINMAIN %s
# MAIN: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI # MAIN: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
# WMAIN: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI # WMAIN: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_CUI
# WINMAIN: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI # WINMAIN: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI
▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines

test/COFF/subsystem.test

Show All 11 Lines
# RUN: %p/Inputs/ret42.obj # RUN: %p/Inputs/ret42.obj
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s # RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK2 %s
CHECK2: MajorOperatingSystemVersion: 8 CHECK2: MajorOperatingSystemVersion: 8
CHECK2: MinorOperatingSystemVersion: 9 CHECK2: MinorOperatingSystemVersion: 9
CHECK2: MajorSubsystemVersion: 8 CHECK2: MajorSubsystemVersion: 8
CHECK2: MinorSubsystemVersion: 9 CHECK2: MinorSubsystemVersion: 9
CHECK2: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI CHECK2: Subsystem: IMAGE_SUBSYSTEM_WINDOWS_GUI
# RUN: lld-link /entry:main /out:%t.exe /subsystem:default,8.9 \
# RUN: %p/Inputs/ret42.obj
# RUN: llvm-readobj --file-headers %t.exe | FileCheck -check-prefix=CHECK3 %s
CHECK3: MajorOperatingSystemVersion: 8
CHECK3: MinorOperatingSystemVersion: 9
CHECK3: MajorSubsystemVersion: 8
CHECK3: MinorSubsystemVersion: 9