[lld] [LLD] [COFF] Fix deducing the machine type from LTO objects for ARM/Thumb (PR #71335)
Martin Storsjö via llvm-commits
llvm-commits at lists.llvm.org
Sun Nov 5 14:32:48 PST 2023
https://github.com/mstorsjo created https://github.com/llvm/llvm-project/pull/71335
In practice, all the Windows ARMNT IR objects show the architecture type Thumb, not ARM.
Most other switch cases for architecture in lld/COFF check for and treat `arm` and `thumb` equally.
>From 2d79e747098ec36570cf4c102c48d01537ef9ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
Date: Tue, 31 Oct 2023 00:46:22 +0200
Subject: [PATCH] [LLD] [COFF] Fix deducing the machine type from LTO objects
for ARM/Thumb
In practice, all the Windows ARMNT IR objects show the architecture
type thumb, not ARM.
---
lld/COFF/InputFiles.cpp | 1 +
lld/test/COFF/lto-arm.ll | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
create mode 100644 lld/test/COFF/lto-arm.ll
diff --git a/lld/COFF/InputFiles.cpp b/lld/COFF/InputFiles.cpp
index 79d0ed62307ba23..132a3ccfaffbb8f 100644
--- a/lld/COFF/InputFiles.cpp
+++ b/lld/COFF/InputFiles.cpp
@@ -1090,6 +1090,7 @@ MachineTypes BitcodeFile::getMachineType() {
case Triple::x86:
return I386;
case Triple::arm:
+ case Triple::thumb:
return ARMNT;
case Triple::aarch64:
return ARM64;
diff --git a/lld/test/COFF/lto-arm.ll b/lld/test/COFF/lto-arm.ll
new file mode 100644
index 000000000000000..9a5cf30f012688f
--- /dev/null
+++ b/lld/test/COFF/lto-arm.ll
@@ -0,0 +1,19 @@
+; REQUIRES: arm
+
+; RUN: llvm-as %s -o %t.obj
+
+; RUN: lld-link /entry:entry %t.obj /out:%t.exe /subsystem:console 2>&1 | FileCheck %s --check-prefix=ERR --allow-empty
+; RUN: llvm-readobj %t.exe | FileCheck %s
+
+; ERR-NOT: /machine is not specified
+
+; CHECK: Format: COFF-ARM{{$}}
+; CHECK: Arch: thumb
+
+target datalayout = "e-m:w-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64"
+target triple = "thumbv7-w64-windows-gnu"
+
+define dso_local arm_aapcs_vfpcc void @entry() {
+entry:
+ ret void
+}
More information about the llvm-commits
mailing list