make/lib/CoreLibraries.gmk

*** 33,43 ****
  # libfdlibm is statically linked with libjava below and not delivered into the
  # product on its own.
  
  BUILD_LIBFDLIBM_OPTIMIZATION := NONE
  
! ifeq ($(OPENJDK_TARGET_OS), solaris)
    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
  endif
  
  # If FDLIBM_CFLAGS is non-empty we know that we can optimize
  # fdlibm when adding those extra C flags. Currently GCC,
--- 33,43 ----
  # libfdlibm is statically linked with libjava below and not delivered into the
  # product on its own.
  
  BUILD_LIBFDLIBM_OPTIMIZATION := NONE
  
! ifeq ($(call isTargetOs, solaris), true)
    BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
  endif
  
  # If FDLIBM_CFLAGS is non-empty we know that we can optimize
  # fdlibm when adding those extra C flags. Currently GCC,
*** 66,76 ****
  ))
  
  ##########################################################################################
  
  LIBVERIFY_OPTIMIZATION := HIGH
! ifneq ($(findstring $(OPENJDK_TARGET_OS), solaris linux), )
    ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
      LIBVERIFY_OPTIMIZATION := LOW
    endif
  endif
  
--- 66,76 ----
  ))
  
  ##########################################################################################
  
  LIBVERIFY_OPTIMIZATION := HIGH
! ifeq ($(call isTargetOs, solaris linux), true)
    ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
      LIBVERIFY_OPTIMIZATION := LOW
    endif
  endif
  
*** 90,100 ****
  
  ##########################################################################################
  
  LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
    BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
    BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
  endif
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
--- 90,100 ----
  
  ##########################################################################################
  
  LIBJAVA_CFLAGS := -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
  
! ifeq ($(call isTargetOs, macosx), true)
    BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
    BUILD_LIBJAVA_java_props_macosx.c_CFLAGS := -x objective-c
  endif
  
  $(eval $(call SetupJdkLibrary, BUILD_LIBJAVA, \
*** 179,193 ****
  
  TARGETS += $(BUILD_LIBJIMAGE)
  
  ##########################################################################################
  
! ifeq ($(OPENJDK_TARGET_OS), macosx)
    LIBJLI_EXCLUDE_FILES += java_md_solinux.c
  endif
  
! ifeq ($(OPENJDK_TARGET_OS), windows)
    # Supply the name of the C runtime lib.
    LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"'
    ifneq ($(MSVCP_DLL), )
      LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"'
    endif
--- 179,193 ----
  
  TARGETS += $(BUILD_LIBJIMAGE)
  
  ##########################################################################################
  
! ifeq ($(call isTargetOs, macosx), true)
    LIBJLI_EXCLUDE_FILES += java_md_solinux.c
  endif
  
! ifeq ($(call isTargetOs, windows), true)
    # Supply the name of the C runtime lib.
    LIBJLI_CFLAGS += -DMSVCR_DLL_NAME='"$(notdir $(MSVCR_DLL))"'
    ifneq ($(MSVCP_DLL), )
      LIBJLI_CFLAGS += -DMSVCP_DLL_NAME='"$(notdir $(MSVCP_DLL))"'
    endif
*** 231,241 ****
  
  TARGETS += $(BUILD_LIBJLI)
  
  LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli)
  
! ifeq ($(OPENJDK_TARGET_OS), aix)
    # AIX also requires a static libjli because the compiler doesn't support '-rpath'
    $(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \
        NAME := jli_static, \
        TYPE := STATIC_LIBRARY, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \
--- 231,241 ----
  
  TARGETS += $(BUILD_LIBJLI)
  
  LIBJLI_SRC_DIRS := $(call FindSrcDirsForComponent, java.base, libjli)
  
! ifeq ($(call isTargetOs, aix), true)
    # AIX also requires a static libjli because the compiler doesn't support '-rpath'
    $(eval $(call SetupNativeCompilation, BUILD_LIBJLI_STATIC, \
        NAME := jli_static, \
        TYPE := STATIC_LIBRARY, \
        OUTPUT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE), \