diff options
| -rw-r--r-- | lld/lib/Driver/WinLinkDriver.cpp | 1 | ||||
| -rw-r--r-- | lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp | 10 | ||||
| -rw-r--r-- | lld/unittests/DriverTests/WinLinkDriverTest.cpp | 5 |
3 files changed, 5 insertions, 11 deletions
diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp index d1e4377184d..1d199776288 100644 --- a/lld/lib/Driver/WinLinkDriver.cpp +++ b/lld/lib/Driver/WinLinkDriver.cpp @@ -192,7 +192,6 @@ static llvm::COFF::MachineTypes stringToMachineType(StringRef str) { // However, given that LLVM only supports ARM NT, default to that for now. return llvm::StringSwitch<llvm::COFF::MachineTypes>(str.lower()) .Case("arm", llvm::COFF::IMAGE_FILE_MACHINE_ARMNT) - .Case("ebc", llvm::COFF::IMAGE_FILE_MACHINE_EBC) .Case("x64", llvm::COFF::IMAGE_FILE_MACHINE_AMD64) .Case("x86", llvm::COFF::IMAGE_FILE_MACHINE_I386) .Default(llvm::COFF::IMAGE_FILE_MACHINE_UNKNOWN); diff --git a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp index 57024c27c50..ee9460f488c 100644 --- a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp +++ b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp @@ -74,16 +74,6 @@ bool PECOFFLinkingContext::validateImpl(raw_ostream &diagnostics) { return false; } - switch (_machineType) { - case llvm::COFF::IMAGE_FILE_MACHINE_I386: - case llvm::COFF::IMAGE_FILE_MACHINE_AMD64: - case llvm::COFF::IMAGE_FILE_MACHINE_ARMNT: - break; - default: - diagnostics << "Machine type other than arm/x86/x86_64 is not supported.\n"; - return false; - } - _writer = createWriterPECOFF(*this); return true; } diff --git a/lld/unittests/DriverTests/WinLinkDriverTest.cpp b/lld/unittests/DriverTests/WinLinkDriverTest.cpp index 62835b6c8f3..ed87f1286bc 100644 --- a/lld/unittests/DriverTests/WinLinkDriverTest.cpp +++ b/lld/unittests/DriverTests/WinLinkDriverTest.cpp @@ -221,6 +221,11 @@ TEST_F(WinLinkParserTest, MachineArm) { EXPECT_EQ(llvm::COFF::IMAGE_FILE_MACHINE_ARMNT, _context.getMachineType()); } +TEST_F(WinLinkParserTest, MachineUnknown) { + EXPECT_FALSE(parse("link.exe", "/machine:nosucharch", "a.obj", nullptr)); + EXPECT_EQ("error: unknown machine type: nosucharch\n", errorMessage()); +} + TEST_F(WinLinkParserTest, MajorImageVersion) { EXPECT_TRUE(parse("link.exe", "/version:7", "foo.o", nullptr)); EXPECT_EQ(7, _context.getImageVersion().majorVersion); |
