jdk/make/lib/CoreLibraries.gmk

*** 1,7 ****
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 161,171 ****
          -export:getLastErrorString \
          -export:getErrorString -delayload:shell32.dll, \
      LIBS_unix := -ljvm -lverify, \
      LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
      LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
!     LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\
      LIBS_macosx := -lfdlibm \
          -framework CoreFoundation \
          -framework Foundation \
          -framework Security -framework SystemConfiguration, \
      LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
--- 161,171 ----
          -export:getLastErrorString \
          -export:getErrorString -delayload:shell32.dll, \
      LIBS_unix := -ljvm -lverify, \
      LIBS_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
      LIBS_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
!     LIBS_aix := $(LIBDL) $(BUILD_LIBFDLIBM) $(LIBM),\
      LIBS_macosx := -lfdlibm \
          -framework CoreFoundation \
          -framework Foundation \
          -framework Security -framework SystemConfiguration, \
      LIBS_windows := jvm.lib $(BUILD_LIBFDLIBM) $(WIN_VERIFY_LIB) \
*** 223,233 ****
      REORDER := $(BUILD_LIBZIP_REORDER), \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
          -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \
!         -export:ZIP_InflateFully -export:ZIP_CRC32, \
      LIBS_unix := -ljvm -ljava $(LIBZ), \
      LIBS_solaris := -lc, \
      LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
--- 223,233 ----
      REORDER := $(BUILD_LIBZIP_REORDER), \
      LDFLAGS := $(LDFLAGS_JDKLIB) \
          $(call SET_SHARED_LIBRARY_ORIGIN), \
      LDFLAGS_windows := -export:ZIP_Open -export:ZIP_Close -export:ZIP_FindEntry \
          -export:ZIP_ReadEntry -export:ZIP_GetNextEntry \
!         -export:ZIP_InflateFully, \
      LIBS_unix := -ljvm -ljava $(LIBZ), \
      LIBS_solaris := -lc, \
      LIBS_windows := jvm.lib $(WIN_JAVA_LIB), \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \