Skip to content

Make it possible to build the Windows executables with MinGW #7

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 3 commits into
base: illwieckz/mingw-1
Choose a base branch
from
+55 −7
Open

Make it possible to build the Windows executables with MinGW #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69a526e
win32: add and use a simplistic macamd64.inc
illwieckz Apr 8, 2025
aa3f42e
win32: skip some CPU detection on Windows with MinGW like 64-bit MSVC
illwieckz Apr 8, 2025
e7a867b
win32: implement CPU detection for MinGW
illwieckz Dec 10, 2025
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
51 changes: 45 additions & 6 deletions src/trusted/platform_qualify/arch/x86/vcpuid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,15 @@ const int kMagicConst_ROUNDSS = 0xc0000000;
const int kMagicConst_POPCNT = 13;
const int kMagicConst_CRC32 = 0xb906c3ea;

#if !(NACL_WINDOWS && (NACL_BUILD_SUBARCH == 64))
#if (NACL_WINDOWS && defined(_MSC_VER) && (NACL_BUILD_SUBARCH == 64))
# define NACL_WINDOWS_MSC_64
#endif

#if (NACL_WINDOWS && !defined(_MSC_VER))
# define NACL_WINDOWS_MINGW
#endif

#if !defined(NACL_WINDOWS_MSC_64)
static int asm_HasMMX(void) {
volatile int before, after;
before = kMagicConst;
Expand Down Expand Up @@ -386,20 +394,34 @@ static int asm_HasCX8(void) {
#endif /* 0 */
#endif /* 64-bit Windows */

#if NACL_WINDOWS && (NACL_BUILD_SUBARCH == 64)
#if defined(NACL_WINDOWS_MSC_64)
static int CheckCPUFeatureDetection(NaClCPUFeaturesX86 *cpuf) {
/* Unfortunately the asm_ tests will not work on 64-bit Windows */
return 0;
}
#else
#if (NACL_LINUX || NACL_OSX)
#if (NACL_LINUX || NACL_OSX || defined(NACL_WINDOWS_MINGW))
/* Linux/MacOS signal handling code, for trapping illegal instruction faults */
static int sawbadinstruction = 0;
static struct sigaction crash_detect;
static int signum;

sigjmp_buf crash_load;
#if defined(NACL_WINDOWS_MINGW)
static PVOID crash_handler;
static jmp_buf crash_load;
#else
static struct sigaction crash_detect;
static sigjmp_buf crash_load;
#endif

#if defined(NACL_WINDOWS_MINGW)
static LONG CALLBACK handler_load(EXCEPTION_POINTERS *ep)
{
if (ep->ExceptionRecord->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION) {
longjmp(crash_load, SIGILL);
}
return EXCEPTION_CONTINUE_SEARCH;
}
#else
void handler_load(int signal_num) {
siglongjmp(crash_load, signal_num);
}
Expand Down Expand Up @@ -427,13 +449,18 @@ void all_sigs(struct sigaction *new_action,
(void) sigaction(SIGCHLD, &ign, 0);
(void) sigaction(SIGTSTP, &ign, 0);
}
#endif

static void SignalInit(void) {
sawbadinstruction = 0;
#if defined(NACL_WINDOWS_MINGW)
crash_handler = AddVectoredExceptionHandler(1, handler_load);
#else
crash_detect.sa_handler = handler_load;
sigemptyset(&crash_detect.sa_mask);
crash_detect.sa_flags = SA_RESETHAND;
all_sigs(&crash_detect, 0);
#endif
}

static void SetSawBadInst(void) {
Expand All @@ -450,7 +477,13 @@ static int SawBadInst(void) {
*/
static int DoTest(int (*thetest)(void), const char *s) {
SignalInit();
if (0 != (signum = sigsetjmp(crash_load, 1))) {

#if defined(NACL_WINDOWS_MINGW)
signum = setjmp(crash_load);
#else
signum = sigsetjmp(crash_load, 1);
#endif
if (0 != signum) {
SetSawBadInst();
if (SIGILL == signum) {
fprintf(stderr, "%s: illegal instruction\n", s);
Expand All @@ -462,10 +495,16 @@ static int DoTest(int (*thetest)(void), const char *s) {
int hasfeature = thetest();
if (hasfeature && (! SawBadInst())) {
printf("[Has %s]\n", s);
#if defined(NACL_WINDOWS_MINGW)
RemoveVectoredExceptionHandler(crash_handler);
#endif
return 0;
}
}
printf("no %s\n", s);
#if defined(NACL_WINDOWS_MINGW)
RemoveVectoredExceptionHandler(crash_handler);
#endif
return 1;
}
#elif NACL_WINDOWS
Expand Down
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
include macamd64.inc

EXTERN NaClSwitch : QWORD

Expand Down