< prev index next >

make/autoconf/flags-cflags.m4

Print this page
8248238: Adding Windows support to OpenJDK on AArch64

Summary: Adding Windows support for AArch64

Contributed-by: Ludovic Henry <luhenry@microsoft.com>, Monica Beckwith <monica.beckwith@microsoft.com>
Reviewed-by:

@@ -648,11 +648,13 @@
     fi
   fi
 
   # toolchain dependend, per-cpu
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x$FLAGS_CPU" = xx86_64; then
+    if test "x$FLAGS_CPU" = xaarch64; then
+      $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"
+    elif test "x$FLAGS_CPU" = xx86_64; then
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_AMD64_ -Damd64"
     else
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_X86_ -Dx86"
     fi
   fi

@@ -722,10 +724,12 @@
       if test "x$DEBUG_LEVEL" != xrelease; then
         # NOTE: This is probably redundant; -homeparams is default on
         # non-release builds.
         $1_CFLAGS_CPU_JVM="-homeparams"
       fi
+    elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
+      $1_CFLAGS_CPU_JVM=""
     fi
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
     FLAGS_SETUP_GCC6_COMPILER_FLAGS($1, $3)
< prev index next >