make/autoconf/spec.gmk.in
changeset 48608 1dab70e20292
parent 48598 c7eea4b541d1
parent 48433 04d8d293e458
child 48751 54f355e65415
equal deleted inserted replaced
48607:7fc3d62481ba 48608:1dab70e20292
     1 #
     1 #
     2 # Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
     2 # Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     4 #
     4 #
     5 # This code is free software; you can redistribute it and/or modify it
     5 # This code is free software; you can redistribute it and/or modify it
     6 # under the terms of the GNU General Public License version 2 only, as
     6 # under the terms of the GNU General Public License version 2 only, as
     7 # published by the Free Software Foundation.  Oracle designates this
     7 # published by the Free Software Foundation.  Oracle designates this
    76 # Legacy support
    76 # Legacy support
    77 OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@
    77 OPENJDK_TARGET_CPU_ISADIR:=@OPENJDK_TARGET_CPU_ISADIR@
    78 OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
    78 OPENJDK_TARGET_CPU_LEGACY:=@OPENJDK_TARGET_CPU_LEGACY@
    79 OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
    79 OPENJDK_TARGET_CPU_LEGACY_LIB:=@OPENJDK_TARGET_CPU_LEGACY_LIB@
    80 OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
    80 OPENJDK_TARGET_CPU_OSARCH:=@OPENJDK_TARGET_CPU_OSARCH@
       
    81 OPENJDK_TARGET_OS_INCLUDE_SUBIDR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
    81 
    82 
    82 HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
    83 HOTSPOT_TARGET_OS := @HOTSPOT_TARGET_OS@
    83 HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@
    84 HOTSPOT_TARGET_OS_TYPE := @HOTSPOT_TARGET_OS_TYPE@
    84 
    85 
    85 HOTSPOT_TARGET_CPU := @HOTSPOT_TARGET_CPU@
    86 HOTSPOT_TARGET_CPU := @HOTSPOT_TARGET_CPU@
    97 
    98 
    98 OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
    99 OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
    99 OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
   100 OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
   100 OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
   101 OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
   101 OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
   102 OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
       
   103 
       
   104 OPENJDK_BUILD_OS_INCLUDE_SUBIDR:=@OPENJDK_TARGET_OS_INCLUDE_SUBDIR@
   102 
   105 
   103 # Target platform value in ModuleTarget class file attribute.
   106 # Target platform value in ModuleTarget class file attribute.
   104 OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
   107 OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
   105 
   108 
   106 # OS_* properties in release file
   109 # OS_* properties in release file
   186 # Version date
   189 # Version date
   187 VERSION_DATE := @VERSION_DATE@
   190 VERSION_DATE := @VERSION_DATE@
   188 
   191 
   189 # Vendor version string
   192 # Vendor version string
   190 VENDOR_VERSION_STRING := @VENDOR_VERSION_STRING@
   193 VENDOR_VERSION_STRING := @VENDOR_VERSION_STRING@
       
   194 
       
   195 # Class-file version
       
   196 VERSION_CLASSFILE_MAJOR := @VERSION_CLASSFILE_MAJOR@
       
   197 VERSION_CLASSFILE_MINOR := @VERSION_CLASSFILE_MINOR@
   191 
   198 
   192 # Convenience CFLAGS settings for passing version information into native programs.
   199 # Convenience CFLAGS settings for passing version information into native programs.
   193 VERSION_CFLAGS := \
   200 VERSION_CFLAGS := \
   194     -DVERSION_FEATURE=$(VERSION_FEATURE) \
   201     -DVERSION_FEATURE=$(VERSION_FEATURE) \
   195     -DVERSION_INTERIM=$(VERSION_INTERIM) \
   202     -DVERSION_INTERIM=$(VERSION_INTERIM) \
   202     -DVERSION_STRING='"$(VERSION_STRING)"' \
   209     -DVERSION_STRING='"$(VERSION_STRING)"' \
   203     -DVERSION_SHORT='"$(VERSION_SHORT)"' \
   210     -DVERSION_SHORT='"$(VERSION_SHORT)"' \
   204     -DVERSION_SPECIFICATION='"$(VERSION_SPECIFICATION)"' \
   211     -DVERSION_SPECIFICATION='"$(VERSION_SPECIFICATION)"' \
   205     -DVERSION_DATE='"$(VERSION_DATE)"' \
   212     -DVERSION_DATE='"$(VERSION_DATE)"' \
   206     -DVENDOR_VERSION_STRING='"$(VENDOR_VERSION_STRING)"' \
   213     -DVENDOR_VERSION_STRING='"$(VENDOR_VERSION_STRING)"' \
       
   214     -DVERSION_CLASSFILE_MAJOR=$(VERSION_CLASSFILE_MAJOR) \
       
   215     -DVERSION_CLASSFILE_MINOR=$(VERSION_CLASSFILE_MINOR) \
   207     #
   216     #
   208 
   217 
   209 ifneq ($(COMPANY_NAME),)
   218 ifneq ($(COMPANY_NAME),)
   210   # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default,
   219   # COMPANY_NAME is set to "N/A" in $AUTOCONF_DIR/version-numbers by default,
   211   # but can be customized with the '--with-vendor-name' configure option.
   220   # but can be customized with the '--with-vendor-name' configure option.
   602 # Interim langtools and rmic modules and arguments
   611 # Interim langtools and rmic modules and arguments
   603 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
   612 INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
   604 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
   613 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
   605 INTERIM_LANGTOOLS_ADD_EXPORTS := \
   614 INTERIM_LANGTOOLS_ADD_EXPORTS := \
   606     --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
   615     --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \
       
   616     --add-exports java.base/jdk.internal.jmod=jdk.compiler.interim \
       
   617     --add-exports java.base/jdk.internal.misc=jdk.compiler.interim \
   607     #
   618     #
   608 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
   619 INTERIM_LANGTOOLS_MODULES_COMMA := $(strip $(subst $(SPACE),$(COMMA),$(strip \
   609     $(INTERIM_LANGTOOLS_MODULES))))
   620     $(INTERIM_LANGTOOLS_MODULES))))
   610 INTERIM_LANGTOOLS_ARGS := \
   621 INTERIM_LANGTOOLS_ARGS := \
   611     --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \
   622     --limit-modules java.base,jdk.zipfs,$(INTERIM_LANGTOOLS_MODULES_COMMA) \