1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Win32: Allow arm64 platform

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2024-11-13 14:44:56 +09:00
parent 3178552342
commit 36c36d0486
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2024-12-17 11:56:51 +00:00 
Merged: https://github.com/ruby/ruby/pull/12367
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
win32/Makefile.sub
View File

@ -335,6 +335,7 @@ COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm)
!elseif "$(ARCH)" == "i386" !elseif "$(ARCH)" == "i386"
COROUTINE_OBJ = coroutine/win32/Context.obj COROUTINE_OBJ = coroutine/win32/Context.obj
COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm) COROUTINE_SRC = $(COROUTINE_OBJ:.obj=.asm)
!elseif "$(ARCH)" == "arm64"
!else !else
!error copy coroutine has been replaced with pthread implementation at 42130a64f02294dc8025af3a51bda518c67ab33d !error copy coroutine has been replaced with pthread implementation at 42130a64f02294dc8025af3a51bda518c67ab33d
!endif !endif

6
win32/setup.mak
View File

@ -201,7 +201,9 @@ del %0 & exit
-generic-: nul -generic-: nul
@$(CPP) <<conftest.c 2>nul | findstr = >>$(MAKEFILE) @$(CPP) <<conftest.c 2>nul | findstr = >>$(MAKEFILE)
#if defined _M_X64 #if defined _M_ARM64
MACHINE = arm64
#elif defined _M_X64
MACHINE = x64 MACHINE = x64
#else #else
MACHINE = x86 MACHINE = x86
@ -217,6 +219,8 @@ MACHINE = x86
@echo MACHINE = x64>>$(MAKEFILE) @echo MACHINE = x64>>$(MAKEFILE)
-ix86-: -osname32- -ix86-: -osname32-
@echo MACHINE = x86>>$(MAKEFILE) @echo MACHINE = x86>>$(MAKEFILE)
-arm64-: -osname64-
@echo MACHINE = arm64>>$(MAKEFILE)
-i386-: -ix86- -i386-: -ix86-
@echo $(CPU) = 3>>$(MAKEFILE) @echo $(CPU) = 3>>$(MAKEFILE)