summaryrefslogtreecommitdiffstats
path: root/llvm/tools/llvm-cvtres/llvm-cvtres.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2017-11-10 22:27:41 +0000
committerMartin Storsjo <martin@martin.st>2017-11-10 22:27:41 +0000
commitba664c1d047a7ec1ac86adaf178bf829cdfd5961 (patch)
treea3ef9fb34f0738f1c5de4f652eabe99bcd8125ca /llvm/tools/llvm-cvtres/llvm-cvtres.cpp
parent6b4a625438983ab8dc84b087a90c9d9bb94ffdde (diff)
downloadbcm5719-llvm-ba664c1d047a7ec1ac86adaf178bf829cdfd5961.tar.gz
bcm5719-llvm-ba664c1d047a7ec1ac86adaf178bf829cdfd5961.zip
[llvm-cvtres] Add support for ARM64
Also change some default cases into llvm_unreachable in WindowsResourceCOFFWriter, to make it easier to find if they are triggerd from within e.g. lld, which supported ARM64 earlier than llvm-cvtres did. Differential Revision: https://reviews.llvm.org/D39892 llvm-svn: 317942
Diffstat (limited to 'llvm/tools/llvm-cvtres/llvm-cvtres.cpp')
-rw-r--r--llvm/tools/llvm-cvtres/llvm-cvtres.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/tools/llvm-cvtres/llvm-cvtres.cpp b/llvm/tools/llvm-cvtres/llvm-cvtres.cpp
index 433a75f63dc..2f33afdb0be 100644
--- a/llvm/tools/llvm-cvtres/llvm-cvtres.cpp
+++ b/llvm/tools/llvm-cvtres/llvm-cvtres.cpp
@@ -126,6 +126,7 @@ int main(int argc_, const char *argv_[]) {
std::string MachineString = InputArgs.getLastArgValue(OPT_MACHINE).upper();
MachineType = StringSwitch<COFF::MachineTypes>(MachineString)
.Case("ARM", COFF::IMAGE_FILE_MACHINE_ARMNT)
+ .Case("ARM64", COFF::IMAGE_FILE_MACHINE_ARM64)
.Case("X64", COFF::IMAGE_FILE_MACHINE_AMD64)
.Case("X86", COFF::IMAGE_FILE_MACHINE_I386)
.Default(COFF::IMAGE_FILE_MACHINE_UNKNOWN);
@@ -155,6 +156,9 @@ int main(int argc_, const char *argv_[]) {
if (Verbose) {
outs() << "Machine: ";
switch (MachineType) {
+ case COFF::IMAGE_FILE_MACHINE_ARM64:
+ outs() << "ARM64\n";
+ break;
case COFF::IMAGE_FILE_MACHINE_ARMNT:
outs() << "ARM\n";
break;
OpenPOWER on IntegriCloud