Skip to content

Commit

Permalink
Get arm64-windows builds working
Browse files Browse the repository at this point in the history
Update various checks to include "ARM64" and "_M_ARM64".

Remove a /BASE flag which fixes an "ARM64 image cannot have base
address below 4GB" error and which arguably shouldn't be used in
modern times since it prevents using dynamic base addresses.

ticket: 9094 (new)
  • Loading branch information
geraldcombs authored and greghudson committed May 18, 2023
1 parent e806d12 commit e991aec
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/config/win-post.in
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ check-windows: check-recurse
!endif # WINSUBDIRS

# Use 64-bit LIBNAME and OBJFILE on 64-bit platforms, if defined.
!if ("$(CPU)" == "IA64") || ("$(CPU)" == "AMD64") || ("$(CPU)" == "ALPHA64")
!if ("$(CPU)" == "IA64") || ("$(CPU)" == "AMD64") || ("$(CPU)" == "ALPHA64") || ("$(CPU)" == "ARM64")
!if defined(WIN64LIBNAME)
LIBNAME=$(WIN64LIBNAME)
!endif
Expand Down
4 changes: 2 additions & 2 deletions src/config/win-pre.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ CPU=i386
CPU=i386
!endif # CPU == X86

!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) && ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" )
!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) && ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" ) && ( "$(CPU)" != "ARM64" )
!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA, CPU=ALPHA64,CPU=IA64, CPU=AMD64)
!endif

!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) || ("$(CPU)" == "ARM64" )
BITS=64
!else
BITS=32
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ clean-windows::
##WIN32##WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
##WIN32## version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib \
##WIN32## $(WINCRTEXTRA)
##WIN32##WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000 /DELAYLOAD:secur32.dll \
##WIN32##WINDLLFLAGS = $(DLL_LINKOPTS) /DELAYLOAD:secur32.dll \
##WIN32## /DELAYLOAD:advapi32.dll /DELAY:UNLOAD /DELAY:NOBIND

##WIN32##S_GLUE=$(OUTPRE)support_glue.obj
Expand Down
2 changes: 1 addition & 1 deletion src/lib/crypto/builtin/aes/brg_endian.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Issue Date: 10/09/2018
defined( __i386__ ) || defined( _M_I86 ) || defined( _M_IX86 ) || \
defined( __OS2__ ) || defined( sun386 ) || defined( __TURBOC__ ) || \
defined( vax ) || defined( vms ) || defined( VMS ) || \
defined( __VMS ) || defined( _M_X64 )
defined( __VMS ) || defined( _M_X64 ) || defined( _M_ARM64 )
# define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN

#elif defined( AMIGA ) || defined( applec ) || defined( __AS400__ ) || \
Expand Down

0 comments on commit e991aec

Please sign in to comment.