[lld] r194131 - [PECOFF] Make /disallowlib an alias for /nodefaultlib.

Rui Ueyama ruiu at google.com
Tue Nov 5 21:48:45 PST 2013


Author: ruiu
Date: Tue Nov  5 23:48:45 2013
New Revision: 194131

URL: http://llvm.org/viewvc/llvm-project?rev=194131&view=rev
Log:
[PECOFF] Make /disallowlib an alias for /nodefaultlib.

I'm not sure if it is really an alias for /nodefaultlib, but I can say that
they are at least similar. Making it an alias would be better than ignoring it.

Modified:
    lld/trunk/lib/Driver/WinLinkOptions.td
    lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp

Modified: lld/trunk/lib/Driver/WinLinkOptions.td
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkOptions.td?rev=194131&r1=194130&r2=194131&view=diff
==============================================================================
--- lld/trunk/lib/Driver/WinLinkOptions.td (original)
+++ lld/trunk/lib/Driver/WinLinkOptions.td Tue Nov  5 23:48:45 2013
@@ -18,6 +18,7 @@ multiclass B<string name, string help> {
 def base    : P<"base", "Base address of the program">;
 def defaultlib : P<"defaultlib", "Add the library to the list of input files">;
 def nodefaultlib : P<"nodefaultlib", "Remove a default library">;
+def disallowlib : Joined<["/", "-", "-?"], "disallowlib:">, Alias<nodefaultlib>;
 def entry   : P<"entry", "Name of entry point symbol">;
 // No help text because /failifmismatch is not intended to be used by the user.
 def failifmismatch : P<"failifmismatch", "">;
@@ -92,7 +93,6 @@ def verbose : F<"verbose">;
 
 def delay : QF<"delay">;
 def delayload : QF<"delayload">;
-def disallowlib : QF<"disallowlib">;
 def errorreport : QF<"errorreport">;
 def pdb : QF<"pdb">;
 def pdbaltpath : QF<"pdbaltpath">;

Modified: lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=194131&r1=194130&r2=194131&view=diff
==============================================================================
--- lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp (original)
+++ lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp Tue Nov  5 23:48:45 2013
@@ -283,6 +283,15 @@ TEST_F(WinLinkParserTest, NoDefaultLibAl
   EXPECT_EQ("a.obj", inputFile(0));
 }
 
+TEST_F(WinLinkParserTest, DisallowLib) {
+  EXPECT_TRUE(parse("link.exe", "/defaultlib:user32.lib",
+                    "/defaultlib:kernel32", "/disallowlib:user32.lib", "a.obj",
+                    nullptr));
+  EXPECT_EQ(2, inputFileCount());
+  EXPECT_EQ("a.obj", inputFile(0));
+  EXPECT_EQ("kernel32.lib", inputFile(1));
+}
+
 //
 // Tests for boolean flags.
 //





More information about the llvm-commits mailing list