make/autoconf/flags-ldflags.m4

rev 60628 : 8248498: Add build system support for Windows AArch64
Reviewed-by:
Contributed-by: mbeckwit, luhenry, burban

*** 163,181 ****
        $1_CPU_LDFLAGS_JVM_ONLY="${$1_CPU_LDFLAGS_JVM_ONLY} -fsigned-char"
        $1_CPU_LDFLAGS="$ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS"
      fi
  
    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
!     if test "x${OPENJDK_$1_CPU}" = "xx86"; then
!       $1_CPU_LDFLAGS="-safeseh"
!       # NOTE: Old build added -machine. Probably not needed.
!       $1_CPU_LDFLAGS_JVM_ONLY="-machine:I386"
        $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
!     else
!       $1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64"
        $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
      fi
    fi
  
    # JVM_VARIANT_PATH depends on if this is build or target...
    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base"
--- 163,180 ----
        $1_CPU_LDFLAGS_JVM_ONLY="${$1_CPU_LDFLAGS_JVM_ONLY} -fsigned-char"
        $1_CPU_LDFLAGS="$ARM_ARCH_TYPE_FLAGS $ARM_FLOAT_TYPE_FLAGS"
      fi
  
    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
!     if test "x${OPENJDK_$1_CPU_BITS}" = "x32"; then
        $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
!     elif test "x${OPENJDK_$1_CPU_BITS}" = "x64"; then
        $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
      fi
+     if test "x${OPENJDK_$1_CPU}" = "xx86"; then
+       $1_CPU_LDFLAGS="-safeseh"
+     fi
    fi
  
    # JVM_VARIANT_PATH depends on if this is build or target...
    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base"