Add support for -all_load. Enhance DarwinLdDriverTest unit test test cases to test...

llvm-svn: 186626

diff --git a/lld/include/lld/ReaderWriter/MachOTargetInfo.h b/lld/include/lld/ReaderWriter/MachOTargetInfo.h
index 2ef4a39..2392c6e 100644 (file)
--- a/lld/include/lld/ReaderWriter/MachOTargetInfo.h
+++ b/lld/include/lld/ReaderWriter/MachOTargetInfo.h
@@ -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

diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp
index 43628a9..60ea967 100644 (file)
--- a/lld/lib/Driver/DarwinLdDriver.cpp
+++ b/lld/lib/Driver/DarwinLdDriver.cpp
@@ -109,6 +109,7 @@ bool DarwinLdDriver::parse(int argc, const char *argv[],
     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, const char *argv[],
   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())

diff --git a/lld/lib/Driver/DarwinOptions.td b/lld/lib/Driver/DarwinOptions.td
index b51d97d..f69d105 100644 (file)
--- a/lld/lib/Driver/DarwinOptions.td
+++ b/lld/lib/Driver/DarwinOptions.td
@@ -20,6 +20,7 @@ def ios_version_min : Separate<["-"], "ios_version_min">,
                           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">;

diff --git a/lld/unittests/DriverTests/DarwinLdDriverTest.cpp b/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
index 6ab4a29..6b51cd6 100644 (file)
--- a/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
+++ b/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
@@ -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