[lld] 482ee33 - [lld] Use correct machine type in ARM64EC COFF headers.
Jacek Caban via llvm-commits
llvm-commits at lists.llvm.org
Mon May 29 10:49:29 PDT 2023
Author: Jacek Caban
Date: 2023-05-29T19:42:24+02:00
New Revision: 482ee33a637d1abaf3c9d5908f2653997e5842a2
URL: https://github.com/llvm/llvm-project/commit/482ee33a637d1abaf3c9d5908f2653997e5842a2
DIFF: https://github.com/llvm/llvm-project/commit/482ee33a637d1abaf3c9d5908f2653997e5842a2.diff
LOG: [lld] Use correct machine type in ARM64EC COFF headers.
This adds very minimal support for ARM64EC/ARM64X targets,
just enough for interesting test cases. Next patches in the
series extend llvm-objdump and llvm-readobj to provide
better tests. Those will also be useful for testing further
ARM64EC LLD support.
Differential Revision: https://reviews.llvm.org/D149086
Added:
lld/test/COFF/arm64ec.test
Modified:
lld/COFF/Chunks.cpp
lld/COFF/Config.h
lld/COFF/Writer.cpp
Removed:
################################################################################
diff --git a/lld/COFF/Chunks.cpp b/lld/COFF/Chunks.cpp
index 7ec4829599906..8ffe79f139ff0 100644
--- a/lld/COFF/Chunks.cpp
+++ b/lld/COFF/Chunks.cpp
@@ -447,6 +447,8 @@ void SectionChunk::applyRelocation(uint8_t *off,
applyRelARM(off, rel.Type, os, s, p, imageBase);
break;
case ARM64:
+ case ARM64EC:
+ case ARM64X:
applyRelARM64(off, rel.Type, os, s, p, imageBase);
break;
default:
@@ -532,6 +534,8 @@ static uint8_t getBaserelType(const coff_relocation &rel,
return IMAGE_REL_BASED_ARM_MOV32T;
return IMAGE_REL_BASED_ABSOLUTE;
case ARM64:
+ case ARM64EC:
+ case ARM64X:
if (rel.Type == IMAGE_REL_ARM64_ADDR64)
return IMAGE_REL_BASED_DIR64;
return IMAGE_REL_BASED_ABSOLUTE;
diff --git a/lld/COFF/Config.h b/lld/COFF/Config.h
index 028cb9c13bafa..029c233e4544a 100644
--- a/lld/COFF/Config.h
+++ b/lld/COFF/Config.h
@@ -37,6 +37,8 @@ class SectionChunk;
// Short aliases.
static const auto AMD64 = llvm::COFF::IMAGE_FILE_MACHINE_AMD64;
static const auto ARM64 = llvm::COFF::IMAGE_FILE_MACHINE_ARM64;
+static const auto ARM64EC = llvm::COFF::IMAGE_FILE_MACHINE_ARM64EC;
+static const auto ARM64X = llvm::COFF::IMAGE_FILE_MACHINE_ARM64X;
static const auto ARMNT = llvm::COFF::IMAGE_FILE_MACHINE_ARMNT;
static const auto I386 = llvm::COFF::IMAGE_FILE_MACHINE_I386;
@@ -96,7 +98,9 @@ enum class ICFLevel {
// Global configuration.
struct Configuration {
enum ManifestKind { Default, SideBySide, Embed, No };
- bool is64() const { return machine == AMD64 || machine == ARM64; }
+ bool is64() const {
+ return machine == AMD64 || llvm::COFF::isAnyArm64(machine);
+ }
llvm::COFF::MachineTypes machine = IMAGE_FILE_MACHINE_UNKNOWN;
size_t wordsize;
diff --git a/lld/COFF/Writer.cpp b/lld/COFF/Writer.cpp
index fe9fb18c7855b..6498cfef27592 100644
--- a/lld/COFF/Writer.cpp
+++ b/lld/COFF/Writer.cpp
@@ -1436,7 +1436,16 @@ template <typename PEHeaderTy> void Writer::writeHeader() {
// Write COFF header
auto *coff = reinterpret_cast<coff_file_header *>(buf);
buf += sizeof(*coff);
- coff->Machine = config->machine;
+ switch (config->machine) {
+ case ARM64EC:
+ coff->Machine = AMD64;
+ break;
+ case ARM64X:
+ coff->Machine = ARM64;
+ break;
+ default:
+ coff->Machine = config->machine;
+ }
coff->NumberOfSections = ctx.outputSections.size();
coff->Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE;
if (config->largeAddressAware)
diff --git a/lld/test/COFF/arm64ec.test b/lld/test/COFF/arm64ec.test
new file mode 100644
index 0000000000000..09e6975304e8d
--- /dev/null
+++ b/lld/test/COFF/arm64ec.test
@@ -0,0 +1,23 @@
+REQUIRES: aarch64
+RUN: split-file %s %t.dir && cd %t.dir
+
+RUN: llvm-mc -filetype=obj -triple=arm64ec-windows arm64ec-data-sym.s -o arm64ec-data-sym.obj
+RUN: llvm-cvtres -machine:arm64x -out:arm64x-resource.obj %S/Inputs/resource.res
+
+RUN: lld-link -out:test.dll -machine:arm64ec arm64ec-data-sym.obj -dll -noentry
+RUN: llvm-readobj --file-headers test.dll | FileCheck -check-prefix=ARM64EC-HEADER %s
+ARM64EC-HEADER: Format: COFF-x86-64
+ARM64EC-HEADER-NEXT: Arch: x86_64
+ARM64EC-HEADER-NEXT: AddressSize: 64bit
+ARM64EC-HEADER: Machine: IMAGE_FILE_MACHINE_AMD64 (0x8664)
+
+RUN: lld-link -out:test.dll -machine:arm64x arm64x-resource.obj -dll -noentry
+RUN: llvm-readobj --file-headers test.dll | FileCheck -check-prefix=ARM64X-HEADER %s
+ARM64X-HEADER: Machine: IMAGE_FILE_MACHINE_ARM64 (0xAA64)
+
+#--- arm64ec-data-sym.s
+ .data
+ .globl arm64ec_data_sym
+ .p2align 2, 0x0
+arm64ec_data_sym:
+ .word 0x02020202
More information about the llvm-commits
mailing list