Skip to content

Prepare for the CMake plumbing to build the loader with MinGW (2) #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
illwieckz wants to merge 1 commit into
base: illwieckz/mingw-1
Choose a base branch
from
+10 −1
Open

Prepare for the CMake plumbing to build the loader with MinGW (2) #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions include-hax/fake_masm/macamd64.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
push_reg macro Reg
push Reg
.pushreg Reg
endm

alloc_stack macro Size
sub rsp, Size
.allocstack Size
endm
2 changes: 1 addition & 1 deletion src/trusted/service_runtime/arch/x86_64/nacl_switch_unwind_win.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; Use of this source code is governed by a BSD-style license that can be
; found in the LICENSE file.

include ksamd64.inc

@illwieckz illwieckz Jun 25, 2026 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I may mention this in the commit message, but it works because all that is needed is two macros from macamd64.inc, and ksamd64.inc included macamd64.inc so it was overkill to include ksamd64.inc but it worked.

When stubbing it we better make it as short as possible.

On MSVC, the standard macamd64.inc will be used, on MinGW the stub will be used by adding the directory containing it to the list of include directories.

@illwieckz illwieckz Jun 25, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also if I remember correctly the standard .inc files use some formatting variants (especially in comment formatting or other useless things like that) that are incompatible with JWasm. The stub is kept as minimal as possible and use a formatting meant to please JWasm. By luck the NaCl .asm file is already compatible with both MASM and JWasm.

include macamd64.inc

EXTERN NaClSwitch : QWORD

Expand Down