<div dir="ltr">These unit tests look very nice! Thank you for doing that.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Jul 18, 2013 at 4:13 PM, Nick Kledzik <span dir="ltr"><<a href="mailto:kledzik@apple.com" target="_blank">kledzik@apple.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kledzik<br>
Date: Thu Jul 18 18:13:13 2013<br>
New Revision: 186626<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=186626&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=186626&view=rev</a><br>
Log:<br>
Add support for -all_load. Enhance DarwinLdDriverTest unit test test cases to test all options parsed so far<br>
<br>
Modified:<br>
lld/trunk/include/lld/ReaderWriter/MachOTargetInfo.h<br>
lld/trunk/lib/Driver/DarwinLdDriver.cpp<br>
lld/trunk/lib/Driver/DarwinOptions.td<br>
lld/trunk/unittests/DriverTests/DarwinLdDriverTest.cpp<br>
<br>
Modified: lld/trunk/include/lld/ReaderWriter/MachOTargetInfo.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/MachOTargetInfo.h?rev=186626&r1=186625&r2=186626&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/MachOTargetInfo.h?rev=186626&r1=186625&r2=186626&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/include/lld/ReaderWriter/MachOTargetInfo.h (original)<br>
+++ lld/trunk/include/lld/ReaderWriter/MachOTargetInfo.h Thu Jul 18 18:13:13 2013<br>
@@ -66,10 +66,12 @@ public:<br>
};<br>
<br>
Arch arch() const { return _arch; }<br>
+ OS os() const { return _os; }<br>
<br>
void setOutputFileType(uint32_t type) { _outputFileType = type; }<br>
void setArch(Arch arch) { _arch = arch; }<br>
bool setOS(OS os, StringRef minOSVersion);<br>
+ bool minOS(StringRef mac, StringRef iOS) const;<br>
<br>
private:<br>
virtual Writer &writer() const;<br>
@@ -87,7 +89,6 @@ private:<br>
uint32_t _value;<br>
};<br>
<br>
- bool minOS(StringRef mac, StringRef iOS) const;<br>
<br>
uint32_t _outputFileType; // e.g MH_EXECUTE<br>
bool _outputFileTypeStatic; // Disambiguate static vs dynamic prog<br>
<br>
Modified: lld/trunk/lib/Driver/DarwinLdDriver.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/DarwinLdDriver.cpp?rev=186626&r1=186625&r2=186626&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/DarwinLdDriver.cpp?rev=186626&r1=186625&r2=186626&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/Driver/DarwinLdDriver.cpp (original)<br>
+++ lld/trunk/lib/Driver/DarwinLdDriver.cpp Thu Jul 18 18:13:13 2013<br>
@@ -109,6 +109,7 @@ bool DarwinLdDriver::parse(int argc, con<br>
switch (kind->getOption().getID()) {<br>
case OPT_dylib:<br>
info.setOutputFileType(mach_o::MH_DYLIB);<br>
+ info.setGlobalsAreDeadStripRoots(true);<br>
break;<br>
case OPT_relocatable:<br>
info.setPrintRemainingUndefines(false);<br>
@@ -139,6 +140,10 @@ bool DarwinLdDriver::parse(int argc, con<br>
if (parsedArgs->getLastArg(OPT_dead_strip))<br>
info.setDeadStripping(true);<br>
<br>
+ // Handle -all_load<br>
+ if (parsedArgs->getLastArg(OPT_all_load))<br>
+ info.setForceLoadAllArchives(true);<br>
+<br>
// Handle -arch xxx<br>
if (llvm::opt::Arg *archStr = parsedArgs->getLastArg(OPT_arch)) {<br>
info.setArch(llvm::StringSwitch<MachOTargetInfo::Arch>(archStr->getValue())<br>
<br>
Modified: lld/trunk/lib/Driver/DarwinOptions.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/DarwinOptions.td?rev=186626&r1=186625&r2=186626&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/DarwinOptions.td?rev=186626&r1=186625&r2=186626&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/Driver/DarwinOptions.td (original)<br>
+++ lld/trunk/lib/Driver/DarwinOptions.td Thu Jul 18 18:13:13 2013<br>
@@ -20,6 +20,7 @@ def ios_version_min : Separate<["-"], "i<br>
HelpText<"min iOS version">;<br>
def ios_simulator_version_min : Separate<["-"], "ios_simulator_version_min">,<br>
HelpText<"min iOS simulator version">;<br>
+def all_load : Flag<["-"], "all_load">;<br>
<br>
// search options<br>
def L : Joined<["-"], "L">;<br>
<br>
Modified: lld/trunk/unittests/DriverTests/DarwinLdDriverTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/DarwinLdDriverTest.cpp?rev=186626&r1=186625&r2=186626&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/DarwinLdDriverTest.cpp?rev=186626&r1=186625&r2=186626&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/unittests/DriverTests/DarwinLdDriverTest.cpp (original)<br>
+++ lld/trunk/unittests/DriverTests/DarwinLdDriverTest.cpp Thu Jul 18 18:13:13 2013<br>
@@ -38,6 +38,11 @@ TEST_F(DarwinLdParserTest, Basic) {<br>
EXPECT_EQ("bar.o", inputFile(1));<br>
}<br>
<br>
+TEST_F(DarwinLdParserTest, Output) {<br>
+ parse("ld", "-o", "my.out", "foo.o", nullptr);<br>
+ EXPECT_EQ("my.out", _info.outputPath());<br>
+}<br>
+<br>
TEST_F(DarwinLdParserTest, Dylib) {<br>
EXPECT_FALSE(parse("ld", "-dylib", "foo.o", nullptr));<br>
EXPECT_EQ(mach_o::MH_DYLIB, _info.outputFileType());<br>
@@ -78,9 +83,103 @@ TEST_F(DarwinLdParserTest, DeadStrip) {<br>
EXPECT_TRUE(_info.deadStrip());<br>
}<br>
<br>
+TEST_F(DarwinLdParserTest, DeadStripRootsExe) {<br>
+ parse("ld", "-dead_strip", "foo.o", nullptr);<br>
+ EXPECT_FALSE(_info.globalsAreDeadStripRoots());<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, DeadStripRootsDylib) {<br>
+ parse("ld", "-dylib", "-dead_strip", "foo.o", nullptr);<br>
+ EXPECT_TRUE(_info.globalsAreDeadStripRoots());<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, ForceLoadArchive) {<br>
+ parse("ld","-all_load", "foo.o", nullptr);<br>
+ EXPECT_TRUE(_info.forceLoadAllArchives());<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, NoForceLoadArchive) {<br>
+ parse("ld", "foo.o", nullptr);<br>
+ EXPECT_FALSE(_info.forceLoadAllArchives());<br>
+}<br>
+<br>
TEST_F(DarwinLdParserTest, Arch) {<br>
EXPECT_FALSE(parse("ld", "-arch", "x86_64", "foo.o", nullptr));<br>
EXPECT_EQ(MachOTargetInfo::arch_x86_64, _info.arch());<br>
+ EXPECT_EQ(mach_o::CPU_TYPE_X86_64, _info.getCPUType());<br>
+ EXPECT_EQ(mach_o::CPU_SUBTYPE_X86_64_ALL, _info.getCPUSubType());<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, Arch_x86) {<br>
+ parse("ld", "-arch", "i386", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::arch_x86, _info.arch());<br>
+ EXPECT_EQ(mach_o::CPU_TYPE_I386, _info.getCPUType());<br>
+ EXPECT_EQ(mach_o::CPU_SUBTYPE_X86_ALL, _info.getCPUSubType());<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, Arch_armv6) {<br>
+ parse("ld", "-arch", "armv6", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::arch_armv6, _info.arch());<br>
+ EXPECT_EQ(mach_o::CPU_TYPE_ARM, _info.getCPUType());<br>
+ EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V6, _info.getCPUSubType());<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, Arch_armv7) {<br>
+ parse("ld", "-arch", "armv7", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::arch_armv7, _info.arch());<br>
+ EXPECT_EQ(mach_o::CPU_TYPE_ARM, _info.getCPUType());<br>
+ EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V7, _info.getCPUSubType());<br>
}<br>
<br>
+TEST_F(DarwinLdParserTest, Arch_armv7s) {<br>
+ parse("ld", "-arch", "armv7s", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::arch_armv7s, _info.arch());<br>
+ EXPECT_EQ(mach_o::CPU_TYPE_ARM, _info.getCPUType());<br>
+ EXPECT_EQ(mach_o::CPU_SUBTYPE_ARM_V7S, _info.getCPUSubType());<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, MinMacOSX10_7) {<br>
+ parse("ld", "-macosx_version_min", "10.7", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::OS::macOSX, _info.os());<br>
+ EXPECT_TRUE(_info.minOS("10.7", ""));<br>
+ EXPECT_FALSE(_info.minOS("10.8", ""));<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, MinMacOSX10_8) {<br>
+ parse("ld", "-macosx_version_min", "10.8.3", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::OS::macOSX, _info.os());<br>
+ EXPECT_TRUE(_info.minOS("10.7", ""));<br>
+ EXPECT_TRUE(_info.minOS("10.8", ""));<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, iOS5) {<br>
+ parse("ld", "-ios_version_min", "5.0", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::OS::iOS, _info.os());<br>
+ EXPECT_TRUE(_info.minOS("", "5.0"));<br>
+ EXPECT_FALSE(_info.minOS("", "6.0"));<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, iOS6) {<br>
+ parse("ld", "-ios_version_min", "6.0", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::OS::iOS, _info.os());<br>
+ EXPECT_TRUE(_info.minOS("", "5.0"));<br>
+ EXPECT_TRUE(_info.minOS("", "6.0"));<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, iOS_Simulator5) {<br>
+ parse("ld", "-ios_simulator_version_min", "5.0", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::OS::iOS_simulator, _info.os());<br>
+ EXPECT_TRUE(_info.minOS("", "5.0"));<br>
+ EXPECT_FALSE(_info.minOS("", "6.0"));<br>
+}<br>
+<br>
+TEST_F(DarwinLdParserTest, iOS_Simulator6) {<br>
+ parse("ld", "-ios_simulator_version_min", "6.0", "foo.o", nullptr);<br>
+ EXPECT_EQ(MachOTargetInfo::OS::iOS_simulator, _info.os());<br>
+ EXPECT_TRUE(_info.minOS("", "5.0"));<br>
+ EXPECT_TRUE(_info.minOS("", "6.0"));<br>
+}<br>
+<br>
+<br>
+<br>
} // end anonymous namespace<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>