make/modules/java.base/lib/CoreLibraries.gmk

rev 59383 : [mq]: final

*** 27,40 ****
  # 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,
  # and clang only.
  ifneq ($(FDLIBM_CFLAGS), )
    BUILD_LIBFDLIBM_OPTIMIZATION := LOW
--- 27,36 ----
*** 60,70 ****
  ))
  
  ##########################################################################################
  
  LIBVERIFY_OPTIMIZATION := HIGH
! ifeq ($(call isTargetOs, solaris linux), true)
    ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
      LIBVERIFY_OPTIMIZATION := LOW
    endif
  endif
  
--- 56,66 ----
  ))
  
  ##########################################################################################
  
  LIBVERIFY_OPTIMIZATION := HIGH
! ifeq ($(call isTargetOs, linux), true)
    ifeq ($(COMPILE_WITH_DEBUG_SYMBOLS), true)
      LIBVERIFY_OPTIMIZATION := LOW
    endif
  endif
  
*** 96,114 ****
          $(LIBJAVA_CFLAGS), \
      jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \
      EXTRA_HEADER_DIRS := libfdlibm, \
      WARNINGS_AS_ERRORS_xlc := false, \
      DISABLED_WARNINGS_gcc := unused-result unused-function, \
-     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_macosx := -L$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/, \
      LDFLAGS_windows := -delayload:shell32.dll, \
      LIBS := $(BUILD_LIBFDLIBM_TARGET), \
      LIBS_unix := -ljvm, \
      LIBS_linux := $(LIBDL), \
-     LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL), \
      LIBS_aix := $(LIBDL) $(LIBM),\
      LIBS_macosx := -framework CoreFoundation \
          -framework Foundation \
          -framework SystemConfiguration, \
      LIBS_windows := jvm.lib \
--- 92,108 ----
*** 213,223 ****
      DISABLED_WARNINGS_clang := sometimes-uninitialized format-nonliteral, \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LIBS_unix := $(LIBZ_LIBS), \
      LIBS_linux := $(LIBDL) -lpthread, \
-     LIBS_solaris := $(LIBDL), \
      LIBS_aix := $(LIBDL),\
      LIBS_macosx := -framework Cocoa -framework Security -framework ApplicationServices, \
      LIBS_windows := advapi32.lib comctl32.lib user32.lib, \
  ))
  
--- 207,216 ----