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