This is an archive of the discontinued LLVM Phabricator instance.

Differential D46077

[COFF] Don't set the tsaware bit on DLLs
ClosedPublic

Authored by hans on Apr 25 2018, 12:55 PM.

Details

Reviewers
ruiu
thakis
Commits
rG03ca8f4fd0d3: [COFF] Don't set the tsaware bit on DLLs
rLLD330868: [COFF] Don't set the tsaware bit on DLLs
rL330868: [COFF] Don't set the tsaware bit on DLLs
Summary

It doesn't apply to DLLs, and link.exe doesn't set it.

Diff Detail

Event Timeline

hans created this revision.Apr 25 2018, 12:55 PM
ruiu accepted this revision.Apr 25 2018, 1:21 PM

LGTM

This revision is now accepted and ready to land.Apr 25 2018, 1:21 PM
Closed by commit rL330868: [COFF] Don't set the tsaware bit on DLLs (authored by hans). · Explain WhyApr 25 2018, 1:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
COFF/
3 lines
test/
COFF/
4 lines

Diff 143991

COFF/Driver.cpp

Show First 20 Lines • Show All 1,159 Lines • ▼ Show 20 Linesvoid LinkerDriver::link(ArrayRef<const char *> ArgsArr) {
Config->AllowBind = Args.hasFlag(OPT_allowbind, OPT_allowbind_no, true); Config->AllowBind = Args.hasFlag(OPT_allowbind, OPT_allowbind_no, true);
Config->AllowIsolation = Config->AllowIsolation =
Args.hasFlag(OPT_allowisolation, OPT_allowisolation_no, true); Args.hasFlag(OPT_allowisolation, OPT_allowisolation_no, true);
Config->Incremental = Config->Incremental =
Args.hasFlag(OPT_incremental, OPT_incremental_no, Args.hasFlag(OPT_incremental, OPT_incremental_no,
!Config->DoGC && !Config->DoICF && !Args.hasArg(OPT_order) && !Config->DoGC && !Config->DoICF && !Args.hasArg(OPT_order) &&
!Args.hasArg(OPT_profile)); !Args.hasArg(OPT_profile));
Config->NxCompat = Args.hasFlag(OPT_nxcompat, OPT_nxcompat_no, true); Config->NxCompat = Args.hasFlag(OPT_nxcompat, OPT_nxcompat_no, true);
Config->TerminalServerAware = Args.hasFlag(OPT_tsaware, OPT_tsaware_no, true); Config->TerminalServerAware =
!Config->DLL && Args.hasFlag(OPT_tsaware, OPT_tsaware_no, true);
Config->DebugDwarf = Args.hasArg(OPT_debug_dwarf); Config->DebugDwarf = Args.hasArg(OPT_debug_dwarf);
Config->DebugGHashes = Args.hasArg(OPT_debug_ghash); Config->DebugGHashes = Args.hasArg(OPT_debug_ghash);
Config->MapFile = getMapFile(Args); Config->MapFile = getMapFile(Args);
if (Config->Incremental && Args.hasArg(OPT_profile)) { if (Config->Incremental && Args.hasArg(OPT_profile)) {
warn("ignoring '/incremental' due to '/profile' specification"); warn("ignoring '/incremental' due to '/profile' specification");
Config->Incremental = false; Config->Incremental = false;
▲ Show 20 Lines • Show All 331 Lines • Show Last 20 Lines

test/COFF/options.test

Show First 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
# RUN: lld-link /out:%t.exe /entry:main %t.obj # RUN: lld-link /out:%t.exe /entry:main %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s # RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
# RUN: lld-link /out:%t.exe /entry:main /tsaware %t.obj # RUN: lld-link /out:%t.exe /entry:main /tsaware %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s # RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=TSAWARE %s
TSAWARE: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE TSAWARE: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE
# RUN: lld-link /tsaware:no /out:%t.exe /entry:main %t.obj # RUN: lld-link /tsaware:no /out:%t.exe /entry:main %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOTSAWARE %s # RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=NOTSAWARE %s
# RUN: lld-link /dll /out:%t.dll /entry:main %t.obj
# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
# RUN: lld-link /tsaware /dll /out:%t.dll /entry:main %t.obj
# RUN: llvm-readobj -file-headers %t.dll | FileCheck -check-prefix=NOTSAWARE %s
NOTSAWARE-NOT: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE NOTSAWARE-NOT: IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE