diff options
| author | Rui Ueyama <ruiu@google.com> | 2013-07-23 17:17:19 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2013-07-23 17:17:19 +0000 |
| commit | fbf576370820f710e8c90a8f4125eb3ffd0d882a (patch) | |
| tree | 1c7cfc4679157c2e2f29dad23add0efc5b9a2211 /lld/lib/ReaderWriter | |
| parent | ca0be23b39df3255ff5272b5c3d9442aee7584b2 (diff) | |
| download | bcm5719-llvm-fbf576370820f710e8c90a8f4125eb3ffd0d882a.tar.gz bcm5719-llvm-fbf576370820f710e8c90a8f4125eb3ffd0d882a.zip | |
[PECOFF] Support -tsaware:no command line option.
llvm-svn: 186957
Diffstat (limited to 'lld/lib/ReaderWriter')
| -rw-r--r-- | lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp index 2c08b10830e..53e82c4cc15 100644 --- a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp @@ -196,9 +196,11 @@ public: // them. uint16_t dllCharacteristics = llvm::COFF::IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE | - llvm::COFF::IMAGE_DLL_CHARACTERISTICS_NO_SEH | - llvm::COFF::IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE; - if (targetInfo.getNxCompat()) + llvm::COFF::IMAGE_DLL_CHARACTERISTICS_NO_SEH; + if (targetInfo.isTerminalServerAware()) + dllCharacteristics |= + llvm::COFF::IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE; + if (targetInfo.isNxCompat()) dllCharacteristics |= llvm::COFF::IMAGE_DLL_CHARACTERISTICS_NX_COMPAT; _peHeader.DLLCharacteristics = dllCharacteristics; |
