[LLD][MinGW] Support machine:arm64x when invoked in MinGW mode. #145343

WhatAmISupposedToPutHere · 2025-06-23T15:35:59Z

Mingw mode already supports building machine:arm64ec arm64x binaries, support machine:arm64x ones too.

Mingw mode already supports building machine:arm64ec arm64x binaries, support machine:arm64x ones too. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

github-actions · 2025-06-23T15:36:20Z

Thank you for submitting a Pull Request (PR) to the LLVM Project!

This PR will be automatically labeled and the relevant teams will be notified.

If you wish to, you can add reviewers by using the "Reviewers" section on this page.

If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using @ followed by their GitHub username.

If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers.

If you have further questions, they may be answered by the LLVM GitHub User Guide.

You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums.

llvmbot · 2025-06-23T15:36:52Z

@llvm/pr-subscribers-lld-coff
@llvm/pr-subscribers-lld-wasm
@llvm/pr-subscribers-lld-macho

@llvm/pr-subscribers-lld-elf

Author: WhatAmISupposedToPutHere (WhatAmISupposedToPutHere)

Changes

Mingw mode already supports building machine:arm64ec arm64x binaries, support machine:arm64x ones too.

Full diff: https://github.com/llvm/llvm-project/pull/145343.diff

3 Files Affected:

(modified) lld/Common/DriverDispatcher.cpp (+1-1)
(modified) lld/MinGW/Driver.cpp (+2)
(modified) lld/test/MinGW/driver.test (+6)

diff --git a/lld/Common/DriverDispatcher.cpp b/lld/Common/DriverDispatcher.cpp
index fe18c320983fa..34f0ed24b3df0 100644
--- a/lld/Common/DriverDispatcher.cpp
+++ b/lld/Common/DriverDispatcher.cpp
@@ -45,7 +45,7 @@ static cl::TokenizerCallback getDefaultQuotingStyle() {
 
 static bool isPETargetName(StringRef s) {
   return s == "i386pe" || s == "i386pep" || s == "thumb2pe" || s == "arm64pe" ||
-         s == "arm64ecpe";
+         s == "arm64ecpe" || s == "arm64xpe";
 }
 
 static std::optional<bool> isPETarget(llvm::ArrayRef<const char *> args) {
diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp
index 98d48bdfcf311..5098dbd77b4fd 100644
--- a/lld/MinGW/Driver.cpp
+++ b/lld/MinGW/Driver.cpp
@@ -448,6 +448,8 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
       add("-machine:arm64");
     else if (s == "arm64ecpe")
       add("-machine:arm64ec");
+    else if (s == "arm64xpe")
+      add("-machine:arm64x");
     else
       error("unknown parameter: -m" + s);
   }
diff --git a/lld/test/MinGW/driver.test b/lld/test/MinGW/driver.test
index 907d2d87dda5c..618b888504320 100644
--- a/lld/test/MinGW/driver.test
+++ b/lld/test/MinGW/driver.test
@@ -31,6 +31,12 @@ ARM64EC-SAME: -machine:arm64ec
 ARM64EC-SAME: -alternatename:__image_base__=__ImageBase
 ARM64EC-SAME: foo.o
 
+RUN: ld.lld -### foo.o -m arm64xpe 2>&1 | FileCheck -check-prefix=ARM64X %s
+ARM64X:      -out:a.exe
+ARM64X-SAME: -machine:arm64x
+ARM64X-SAME: -alternatename:__image_base__=__ImageBase
+ARM64X-SAME: foo.o
+
 RUN: ld.lld -### foo.o -m i386pep -shared 2>&1 | FileCheck -check-prefix=SHARED %s
 RUN: ld.lld -### foo.o -m i386pep --shared 2>&1 | FileCheck -check-prefix=SHARED %s
 RUN: ld.lld -### foo.o -m i386pep --dll 2>&1 | FileCheck -check-prefix=SHARED %s

llvmbot · 2025-06-23T15:36:52Z

@llvm/pr-subscribers-lld

Author: WhatAmISupposedToPutHere (WhatAmISupposedToPutHere)

Changes

Mingw mode already supports building machine:arm64ec arm64x binaries, support machine:arm64x ones too.

Full diff: https://github.com/llvm/llvm-project/pull/145343.diff

3 Files Affected:

(modified) lld/Common/DriverDispatcher.cpp (+1-1)
(modified) lld/MinGW/Driver.cpp (+2)
(modified) lld/test/MinGW/driver.test (+6)

diff --git a/lld/Common/DriverDispatcher.cpp b/lld/Common/DriverDispatcher.cpp
index fe18c320983fa..34f0ed24b3df0 100644
--- a/lld/Common/DriverDispatcher.cpp
+++ b/lld/Common/DriverDispatcher.cpp
@@ -45,7 +45,7 @@ static cl::TokenizerCallback getDefaultQuotingStyle() {
 
 static bool isPETargetName(StringRef s) {
   return s == "i386pe" || s == "i386pep" || s == "thumb2pe" || s == "arm64pe" ||
-         s == "arm64ecpe";
+         s == "arm64ecpe" || s == "arm64xpe";
 }
 
 static std::optional<bool> isPETarget(llvm::ArrayRef<const char *> args) {
diff --git a/lld/MinGW/Driver.cpp b/lld/MinGW/Driver.cpp
index 98d48bdfcf311..5098dbd77b4fd 100644
--- a/lld/MinGW/Driver.cpp
+++ b/lld/MinGW/Driver.cpp
@@ -448,6 +448,8 @@ bool link(ArrayRef<const char *> argsArr, llvm::raw_ostream &stdoutOS,
       add("-machine:arm64");
     else if (s == "arm64ecpe")
       add("-machine:arm64ec");
+    else if (s == "arm64xpe")
+      add("-machine:arm64x");
     else
       error("unknown parameter: -m" + s);
   }
diff --git a/lld/test/MinGW/driver.test b/lld/test/MinGW/driver.test
index 907d2d87dda5c..618b888504320 100644
--- a/lld/test/MinGW/driver.test
+++ b/lld/test/MinGW/driver.test
@@ -31,6 +31,12 @@ ARM64EC-SAME: -machine:arm64ec
 ARM64EC-SAME: -alternatename:__image_base__=__ImageBase
 ARM64EC-SAME: foo.o
 
+RUN: ld.lld -### foo.o -m arm64xpe 2>&1 | FileCheck -check-prefix=ARM64X %s
+ARM64X:      -out:a.exe
+ARM64X-SAME: -machine:arm64x
+ARM64X-SAME: -alternatename:__image_base__=__ImageBase
+ARM64X-SAME: foo.o
+
 RUN: ld.lld -### foo.o -m i386pep -shared 2>&1 | FileCheck -check-prefix=SHARED %s
 RUN: ld.lld -### foo.o -m i386pep --shared 2>&1 | FileCheck -check-prefix=SHARED %s
 RUN: ld.lld -### foo.o -m i386pep --dll 2>&1 | FileCheck -check-prefix=SHARED %s

cjacek

The change looks fine to me.

FWIW, the MinGW-specific parts should mostly be fine on the lld-link side. There are probably some nuances that will need to be addressed. For example, -alternatename only applies to the EC symbol table, so the __image_base__ alias will likely need a different approach.

The main remaining challenge for setting up a fully ARM64X-compatible MinGW toolchain is how static and import libraries are distributed. On MSVC, they’re provided as hybrid archives, which eliminates ambiguity: the linker just finds one file and pulls in both sets of symbols. Replicating this with MinGW will require a fair bit of build system work, mostly on the mingw-w64-crt side.

mstorsjo

LGTM

mstorsjo · 2025-06-25T10:51:13Z

Before this is merged, please turn off the Keep my email addresses private setting in your account. See LLVM Developer Policy and LLVM Discourse for more information.

github-actions · 2025-07-10T20:47:56Z

@WhatAmISupposedToPutHere Congratulations on having your first Pull Request (PR) merged into the LLVM Project!

Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR.

Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues.

How to do this, and the rest of the post-merge process, is covered in detail here.

If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again.

If you don't get any reports, no action is required from you. Your changes are working as expected, well done!

[LLD][MinGW] Support machine:arm64x when invoked in MinGW mode.

c7a9b98

Mingw mode already supports building machine:arm64ec arm64x binaries, support machine:arm64x ones too. Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>

llvmbot added lld lld:MachO lld:ELF lld:COFF lld:wasm labels Jun 23, 2025

cjacek approved these changes Jun 23, 2025

View reviewed changes

mstorsjo approved these changes Jun 23, 2025

View reviewed changes

Merge branch 'main' into arm64x-mingw

be5e61c

mstorsjo merged commit 74a6e5c into llvm:main Jul 10, 2025
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[LLD][MinGW] Support machine:arm64x when invoked in MinGW mode. #145343

[LLD][MinGW] Support machine:arm64x when invoked in MinGW mode. #145343

Uh oh!

WhatAmISupposedToPutHere commented Jun 23, 2025

Uh oh!

github-actions bot commented Jun 23, 2025

Uh oh!

llvmbot commented Jun 23, 2025 •

edited

Loading

Uh oh!

llvmbot commented Jun 23, 2025

Uh oh!

cjacek left a comment

Uh oh!

mstorsjo left a comment

Uh oh!

mstorsjo commented Jun 25, 2025

Uh oh!

Uh oh!

github-actions bot commented Jul 10, 2025

Uh oh!

Uh oh!

[LLD][MinGW] Support machine:arm64x when invoked in MinGW mode. #145343

[LLD][MinGW] Support machine:arm64x when invoked in MinGW mode. #145343

Uh oh!

Conversation

WhatAmISupposedToPutHere commented Jun 23, 2025

Uh oh!

github-actions bot commented Jun 23, 2025

Uh oh!

llvmbot commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Jun 23, 2025

Uh oh!

cjacek left a comment

Choose a reason for hiding this comment

Uh oh!

mstorsjo left a comment

Choose a reason for hiding this comment

Uh oh!

mstorsjo commented Jun 25, 2025

Uh oh!

Uh oh!

github-actions bot commented Jul 10, 2025

Uh oh!

Uh oh!

llvmbot commented Jun 23, 2025 •

edited

Loading