common/autoconf/hotspot.m4

*** 23,33 ****
  # questions.
  #
  
  # All valid JVM features, regardless of platform
  VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
!     fprof vm-structs jni-check services management all-gcs nmt cds static-build"
  
  # All valid JVM variants
  VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
  
  ###############################################################################
--- 23,34 ----
  # questions.
  #
  
  # All valid JVM features, regardless of platform
  VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
!     fprof vm-structs jni-check services management all-gcs nmt cds \
!     static-build link-time-opt"
  
  # All valid JVM variants
  VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
  
  ###############################################################################
*** 112,127 ****
--- 113,145 ----
    fi
  
    AC_SUBST(JVM_VARIANTS)
    AC_SUBST(VALID_JVM_VARIANTS)
  
+   # Override hotspot cpu definitions
+   if test "x$OPENJDK_TARGET_CPU" = xarm; then
+     HOTSPOT_TARGET_CPU=arm_32
+     HOTSPOT_TARGET_CPU_DEFINE="ARM32"
+     JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char"
+     JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char"
+   elif test "x$OPENJDK_TARGET_ABI_PROFILE" = xarm64; then
+     AC_MSG_CHECKING([OPENJDK_TARGET_ABI_PROFILE == arm64])
+     HOTSPOT_TARGET_CPU=arm_64
+     HOTSPOT_TARGET_CPU_ARCH=arm
+     JVM_LDFLAGS="$JVM_LDFLAGS -fsigned-char"
+     JVM_CFLAGS="$JVM_CFLAGS -DARM -fsigned-char"
+   fi
+ 
    if HOTSPOT_CHECK_JVM_VARIANT(zero) || HOTSPOT_CHECK_JVM_VARIANT(zeroshark); then
      # zero behaves as a platform and rewrites these values. This is really weird. :(
      # We are guaranteed that we do not build any other variants when building zero.
      HOTSPOT_TARGET_CPU=zero
      HOTSPOT_TARGET_CPU_ARCH=zero
    fi
+ 
+ 
+ 
  ])
  
  ###############################################################################
  # Check if dtrace should be enabled and has all prerequisites present.
  #
*** 246,263 ****
      JVM_FEATURES_jvmci="jvmci"
    else
      JVM_FEATURES_jvmci=""
    fi
  
    # All variants but minimal (and custom) get these features
    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
  
    # Enable features depending on variant.
    JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
    JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
    JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
!   JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
    JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_custom="$JVM_FEATURES"
  
    AC_SUBST(JVM_FEATURES_server)
--- 264,290 ----
      JVM_FEATURES_jvmci="jvmci"
    else
      JVM_FEATURES_jvmci=""
    fi
  
+   if test "x$OPENJDK_TARGET_CPU" = xarm \
+       && ! HOTSPOT_CHECK_JVM_FEATURE(pregen-interpreter); then
+     # Default to use link time optimizations on minimal on arm, unless
+     # pregen-interpreter is active.
+     JVM_FEATURES_link_time_opt="link-time-opt"
+   else
+     JVM_FEATURES_link_time_opt=""
+   fi
+ 
    # All variants but minimal (and custom) get these features
    NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
  
    # Enable features depending on variant.
    JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
    JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
    JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
!   JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES $JVM_FEATURES_link_time_opt"
    JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
    JVM_FEATURES_custom="$JVM_FEATURES"
  
    AC_SUBST(JVM_FEATURES_server)