diff options
| author | Martin Storsjö <martin@martin.st> | 2023-11-07 12:00:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-07 12:00:31 +0200 |
| commit | e8961969ec8906c593409748e7c24355236b3cc1 (patch) | |
| tree | 11b068fc8d21dde321ad0ecdea89d29e3331ff08 | |
| parent | 05ed92127cebdd483f1ae2039d8e16917055621d (diff) | |
| download | llvm-e8961969ec8906c593409748e7c24355236b3cc1.zip llvm-e8961969ec8906c593409748e7c24355236b3cc1.tar.gz llvm-e8961969ec8906c593409748e7c24355236b3cc1.tar.bz2 | |
[LLD] [COFF] Fix deducing the machine type from LTO objects for ARM/Thumb (#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.
| -rw-r--r-- | lld/COFF/InputFiles.cpp | 1 | ||||
| -rw-r--r-- | lld/test/COFF/lto-arm.ll | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/lld/COFF/InputFiles.cpp b/lld/COFF/InputFiles.cpp index 79d0ed6..132a3cc 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 0000000..9a5cf30 --- /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 +} |