make/autoconf/spec.gmk.in

rev 59383 : [mq]: final

*** 81,91 ****
  OPENJDK_TARGET_CPU_ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
  
  COMPILE_TYPE:=@COMPILE_TYPE@
  
  # Legacy support
- OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@
  OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
  OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
  OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
  OPENJDK_TARGET_OS_INCLUDE_SUBDIR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
  
--- 81,90 ----
*** 425,435 ****
  MACOSX_VERSION_MAX=@MACOSX_VERSION_MAX@
  
  # The macosx code signing identity to use
  MACOSX_CODESIGN_IDENTITY=@MACOSX_CODESIGN_IDENTITY@
  
! # Toolchain type: gcc, clang, solstudio, lxc, microsoft...
  TOOLCHAIN_TYPE:=@TOOLCHAIN_TYPE@
  TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
  CC_VERSION_NUMBER := @CC_VERSION_NUMBER@
  CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
  
--- 424,434 ----
  MACOSX_VERSION_MAX=@MACOSX_VERSION_MAX@
  
  # The macosx code signing identity to use
  MACOSX_CODESIGN_IDENTITY=@MACOSX_CODESIGN_IDENTITY@
  
! # Toolchain type: gcc, clang, xlc, microsoft...
  TOOLCHAIN_TYPE:=@TOOLCHAIN_TYPE@
  TOOLCHAIN_VERSION := @TOOLCHAIN_VERSION@
  CC_VERSION_NUMBER := @CC_VERSION_NUMBER@
  CXX_VERSION_NUMBER := @CXX_VERSION_NUMBER@
  
*** 468,478 ****
  C_FLAG_DEPS:=@C_FLAG_DEPS@
  CXX_FLAG_DEPS:=@CXX_FLAG_DEPS@
  
  DISABLE_WARNING_PREFIX := @DISABLE_WARNING_PREFIX@
  CFLAGS_WARNINGS_ARE_ERRORS:=@CFLAGS_WARNINGS_ARE_ERRORS@
- LDFLAGS_WARNINGS_ARE_ERRORS:=@LDFLAGS_WARNINGS_ARE_ERRORS@
  DISABLED_WARNINGS := @DISABLED_WARNINGS@
  DISABLED_WARNINGS_C := @DISABLED_WARNINGS_C@
  DISABLED_WARNINGS_CXX := @DISABLED_WARNINGS_CXX@
  
  # A global flag (true or false) determining if native warnings are considered errors.
--- 467,476 ----
*** 522,532 ****
  SDKROOT:=@SDKROOT@
  
  # LDFLAGS used to link the jdk native libraries (C-code)
  LDFLAGS_JDKLIB:=@LDFLAGS_JDKLIB@
  JDKLIB_LIBS:=@JDKLIB_LIBS@
- GLOBAL_LIBS:=@GLOBAL_LIBS@
  
  # LDFLAGS used to link the jdk native launchers (C-code)
  LDFLAGS_JDKEXE:=@LDFLAGS_JDKEXE@
  JDKEXE_LIBS:=@JDKEXE_LIBS@
  
--- 520,529 ----
*** 572,585 ****
  
  # Options to linker to specify a mapfile.
  # (Note absence of := assignment, because we do not want to evaluate the macro body here)
  SET_SHARED_LIBRARY_MAPFILE=@SET_SHARED_LIBRARY_MAPFILE@
  
- # Options for C/CXX compiler to be used if linking is performed
- #   using reorder file
- C_FLAG_REORDER:=@C_FLAG_REORDER@
- 
  #
  # Options for generating debug symbols
  COMPILE_WITH_DEBUG_SYMBOLS := @COMPILE_WITH_DEBUG_SYMBOLS@
  COPY_DEBUG_SYMBOLS := @COPY_DEBUG_SYMBOLS@
  ZIP_EXTERNAL_DEBUG_SYMBOLS := @ZIP_EXTERNAL_DEBUG_SYMBOLS@
--- 569,578 ----
*** 744,754 ****
  CYGPATH:=@CYGPATH@
  WSLPATH:=@WSLPATH@
  LDD:=@LDD@
  OTOOL:=@OTOOL@
  READELF:=@READELF@
- ELFEDIT:=@ELFEDIT@
  EXPR:=@EXPR@
  FILE:=@FILE@
  DOT:=@DOT@
  HG:=@HG@
  GIT:=@GIT@
--- 737,746 ----
*** 761,771 ****
  DTRACE := @DTRACE@
  FIXPATH:=@FIXPATH@
  ULIMIT:=@ULIMIT@
  
  TAR_TYPE:=@TAR_TYPE@
- TAR_CREATE_EXTRA_PARAM:=@TAR_CREATE_EXTRA_PARAM@
  TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
  TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
  
  # Build setup
  ENABLE_AOT:=@ENABLE_AOT@
--- 753,762 ----
*** 778,788 ****
  LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
  MSVCR_DLL:=@MSVCR_DLL@
  VCRUNTIME_1_DLL:=@VCRUNTIME_1_DLL@
  MSVCP_DLL:=@MSVCP_DLL@
  UCRT_DLL_DIR:=@UCRT_DLL_DIR@
- STLPORT_LIB:=@STLPORT_LIB@
  ENABLE_PANDOC:=@ENABLE_PANDOC@
  PANDOC_MARKDOWN_FLAG:=@PANDOC_MARKDOWN_FLAG@
  
  ####################################################
  #
--- 769,778 ----