make/hotspot/lib/JvmFeatures.gmk

*** 150,161 ****
  ifeq ($(call check-jvm-feature, link-time-opt), true)
    # NOTE: Disable automatic opimization level and let the explicit cflag control
    # optimization level instead. This activates O3 on slowdebug builds, just
    # like the old build, but it's probably not right.
    JVM_OPTIMIZATION :=
!   JVM_CFLAGS_FEATURES += -O3 -flto
!   JVM_LDFLAGS_FEATURES += -O3 -flto -fuse-linker-plugin -fno-strict-aliasing
  endif
  
  ifeq ($(call check-jvm-feature, minimal), true)
    ifeq ($(call check-jvm-feature, link-time-opt), false)
      JVM_OPTIMIZATION := SIZE
--- 150,161 ----
  ifeq ($(call check-jvm-feature, link-time-opt), true)
    # NOTE: Disable automatic opimization level and let the explicit cflag control
    # optimization level instead. This activates O3 on slowdebug builds, just
    # like the old build, but it's probably not right.
    JVM_OPTIMIZATION :=
!   JVM_CFLAGS_FEATURES += -O0 -flto
!   JVM_LDFLAGS_FEATURES += -O0 -flto -fuse-linker-plugin -fno-strict-aliasing
  endif
  
  ifeq ($(call check-jvm-feature, minimal), true)
    ifeq ($(call check-jvm-feature, link-time-opt), false)
      JVM_OPTIMIZATION := SIZE