Skip to content

Commit 9604ee8

Browse files
Monica Beckwithluhenrylewurm
authored and
David Holmes
committedOct 5, 2020
8248238: Implementation: JEP 388: Windows AArch64 Support
Co-authored-by: Monica Beckwith <mbeckwit@openjdk.org> Co-authored-by: Ludovic Henry <luhenry@openjdk.org> Co-authored-by: Bernhard Urban-Forster <burban@openjdk.org> Reviewed-by: dholmes, cjplummer, aph, ihse
1 parent 1c2754b commit 9604ee8

File tree

62 files changed

+2440
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2440
-358
lines changed
 

‎make/autoconf/basic.m4

+10
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,16 @@ AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
117117
fi
118118
])
119119

120+
###############################################################################
121+
# Evaluates platform specific overrides for build devkit variables.
122+
# $1: Name of variable
123+
AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
124+
[
125+
if test "x[$]$1" = x; then
126+
eval $1="\${$1_${OPENJDK_BUILD_CPU}}"
127+
fi
128+
])
129+
120130
###############################################################################
121131
AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
122132
[

‎make/autoconf/flags-cflags.m4

+3-1
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
666666
667667
# toolchain dependend, per-cpu
668668
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
669-
if test "x$FLAGS_CPU" = xx86_64; then
669+
if test "x$FLAGS_CPU" = xaarch64; then
670+
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"
671+
elif test "x$FLAGS_CPU" = xx86_64; then
670672
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_AMD64_ -Damd64"
671673
else
672674
$1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_X86_ -Dx86"

0 commit comments

Comments
 (0)
Please sign in to comment.