From 1dc2123d640b486f6d1bf1bf252d9c3e63a19bf3 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 12 Jun 2019 11:32:43 +0000 Subject: Share /machine: handling code with llvm-cvtres too r363016 let lld-link and llvm-lib share the /machine: parsing code. This lets llvm-cvtres share it as well. Making llvm-cvtres depend on llvm-lib seemed a bit strange (it doesn't need llvm-lib's dependencies on BinaryFormat and BitReader) and I couldn't find a good place to put this code. Since it's just a few lines, put it in lib/Object for now. Differential Revision: https://reviews.llvm.org/D63120 llvm-svn: 363144 --- llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) (limited to 'llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp') diff --git a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp index 852a977e..1201b28 100644 --- a/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp +++ b/llvm/lib/ToolDrivers/llvm-lib/LibDriver.cpp @@ -18,6 +18,7 @@ #include "llvm/Bitcode/BitcodeReader.h" #include "llvm/Object/ArchiveWriter.h" #include "llvm/Object/COFF.h" +#include "llvm/Object/WindowsMachineFlag.h" #include "llvm/Option/Arg.h" #include "llvm/Option/ArgList.h" #include "llvm/Option/Option.h" @@ -140,31 +141,6 @@ static void doList(opt::InputArgList& Args) { fatalOpenError(std::move(Err), B->getBufferIdentifier()); } -// Returns /machine's value. -COFF::MachineTypes llvm::getMachineType(StringRef S) { - return StringSwitch(S.lower()) - .Cases("x64", "amd64", COFF::IMAGE_FILE_MACHINE_AMD64) - .Cases("x86", "i386", COFF::IMAGE_FILE_MACHINE_I386) - .Case("arm", COFF::IMAGE_FILE_MACHINE_ARMNT) - .Case("arm64", COFF::IMAGE_FILE_MACHINE_ARM64) - .Default(COFF::IMAGE_FILE_MACHINE_UNKNOWN); -} - -StringRef llvm::machineToStr(COFF::MachineTypes MT) { - switch (MT) { - case COFF::IMAGE_FILE_MACHINE_ARMNT: - return "arm"; - case COFF::IMAGE_FILE_MACHINE_ARM64: - return "arm64"; - case COFF::IMAGE_FILE_MACHINE_AMD64: - return "x64"; - case COFF::IMAGE_FILE_MACHINE_I386: - return "x86"; - default: - llvm_unreachable("unknown machine type"); - } -} - int llvm::libDriverMain(ArrayRef ArgsArr) { BumpPtrAllocator Alloc; StringSaver Saver(Alloc); -- cgit v1.1