[lld] r184050 - [WinLink] Support /nxcompat command line option.

[Rui Ueyama]

Author: ruiu
Date: Sat Jun 15 22:07:08 2013
New Revision: 184050

URL: http://llvm.org/viewvc/llvm-project?rev=184050&view=rev
Log:
[WinLink] Support /nxcompat command line option.

Modified:
    lld/trunk/include/lld/ReaderWriter/PECOFFTargetInfo.h
    lld/trunk/lib/Driver/WinLinkDriver.cpp
    lld/trunk/lib/Driver/WinLinkOptions.td
    lld/trunk/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
    lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp

Modified: lld/trunk/include/lld/ReaderWriter/PECOFFTargetInfo.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFTargetInfo.h?rev=184050&r1=184049&r2=184050&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/PECOFFTargetInfo.h (original)
+++ lld/trunk/include/lld/ReaderWriter/PECOFFTargetInfo.h Sat Jun 15 22:07:08 2013
@@ -23,12 +23,10 @@ namespace lld {
 class PECOFFTargetInfo : public TargetInfo {
 public:
   PECOFFTargetInfo()
-      : _stackReserve(1024 * 1024),
-        _stackCommit(4096),
-        _heapReserve(1024 * 1024),
-        _heapCommit(4096),
-        _subsystem(llvm::COFF::IMAGE_SUBSYSTEM_UNKNOWN),
-        _minOSVersion(6, 0) {}
+      : _stackReserve(1024 * 1024), _stackCommit(4096),
+        _heapReserve(1024 * 1024), _heapCommit(4096),
+        _subsystem(llvm::COFF::IMAGE_SUBSYSTEM_UNKNOWN), _minOSVersion(6, 0),
+        _nxCompat(true) {}
 
   struct OSVersion {
     OSVersion(int v1, int v2) : majorVersion(v1), minorVersion(v2) {}
@@ -61,6 +59,9 @@ public:
   void setMinOSVersion(const OSVersion &version) { _minOSVersion = version; }
   OSVersion getMinOSVersion() const { return _minOSVersion; }
 
+  void setNxCompat(bool nxCompat) { _nxCompat = nxCompat; }
+  bool getNxCompat() const { return _nxCompat; }
+
   virtual ErrorOr<Reference::Kind> relocKindFromString(StringRef str) const;
   virtual ErrorOr<std::string> stringFromRelocKind(Reference::Kind kind) const;
 
@@ -78,6 +79,7 @@ private:
   uint64_t _heapCommit;
   llvm::COFF::WindowsSubsystem _subsystem;
   OSVersion _minOSVersion;
+  bool _nxCompat;
 
   mutable std::unique_ptr<Reader> _reader;
   mutable std::unique_ptr<Writer> _writer;

Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=184050&r1=184049&r2=184050&view=diff
==============================================================================
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Sat Jun 15 22:07:08 2013
@@ -258,6 +258,10 @@ bool WinLinkDriver::parse(int argc, cons
   if (parsedArgs->getLastArg(OPT_force))
     info.setAllowRemainingUndefines(true);
 
+  // Hanlde -nxcompat:no
+  if (parsedArgs->getLastArg(OPT_no_nxcompat))
+    info.setNxCompat(false);
+
   // Hanlde -out
   if (llvm::opt::Arg *outpath = parsedArgs->getLastArg(OPT_out))
     info.setOutputPath(outpath->getValue());

Modified: lld/trunk/lib/Driver/WinLinkOptions.td
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkOptions.td?rev=184050&r1=184049&r2=184050&view=diff
==============================================================================
--- lld/trunk/lib/Driver/WinLinkOptions.td (original)
+++ lld/trunk/lib/Driver/WinLinkOptions.td Sat Jun 15 22:07:08 2013
@@ -28,5 +28,10 @@ def entry_c: Joined<["-", "/"], "entry:"
 def force : Flag<["-", "/"], "force">,
     HelpText<"Allow undefined symbols when creating executables">;
 
+def nxcompat : Flag<["-", "/"], "nxcompat">,
+    HelpText<"Enable data execution provention">;
+def no_nxcompat : Flag<["-", "/"], "nxcompat:no">,
+    HelpText<"Disable data execution provention">;
+
 def help : Flag<["-", "/"], "help">;
 def help_q : Flag<["-", "/"], "?">, Alias<help>;

Modified: lld/trunk/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp?rev=184050&r1=184049&r2=184050&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp Sat Jun 15 22:07:08 2013
@@ -180,10 +180,12 @@ public:
     // Must be multiple of FileAlignment.
     _peHeader.SizeOfHeaders = 512;
     _peHeader.Subsystem = targetInfo.getSubsystem();
-    _peHeader.DLLCharacteristics =
-        llvm::COFF::IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE
-        | llvm::COFF::IMAGE_DLL_CHARACTERISTICS_NX_COMPAT
-        | llvm::COFF::IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE;
+    uint16_t dllCharacteristics =
+        llvm::COFF::IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE |
+        llvm::COFF::IMAGE_DLL_CHARACTERISTICS_TERMINAL_SERVER_AWARE;
+    if (targetInfo.getNxCompat())
+      dllCharacteristics |= llvm::COFF::IMAGE_DLL_CHARACTERISTICS_NX_COMPAT;
+    _peHeader.DLLCharacteristics = dllCharacteristics;
 
     _peHeader.SizeOfStackReserve = targetInfo.getStackReserve();
     _peHeader.SizeOfStackCommit = targetInfo.getStackCommit();

Modified: lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=184050&r1=184049&r2=184050&view=diff
==============================================================================
--- lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp (original)
+++ lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp Sat Jun 15 22:07:08 2013
@@ -47,6 +47,7 @@ TEST_F(WinLinkParserTest, Basic) {
   EXPECT_EQ(1024 * 1024, info->getStackReserve());
   EXPECT_EQ(4096, info->getStackCommit());
   EXPECT_FALSE(info->allowRemainingUndefines());
+  EXPECT_TRUE(info->getNxCompat());
 }
 
 TEST_F(WinLinkParserTest, WindowsStyleOption) {
@@ -115,4 +116,9 @@ TEST_F(WinLinkParserTest, Force) {
   EXPECT_TRUE(info->allowRemainingUndefines());
 }
 
-}  // end anonymous namespace
+TEST_F(WinLinkParserTest, NoNxCompat) {
+  parse("link.exe", "-nxcompat:no", nullptr);
+  EXPECT_FALSE(info->getNxCompat());
+}
+
+} // end anonymous namespace