1.1 --- a/common/autoconf/spec.gmk.in Mon Jun 25 21:37:09 2012 -0700
1.2 +++ b/common/autoconf/spec.gmk.in Tue Jul 03 16:11:12 2012 -0700
1.3 @@ -23,8 +23,8 @@
1.4 # questions.
1.5 #
1.6
1.7 -# Configured @DATE_WHEN_CONFIGURED@ to build for a @HOST@ system,
1.8 -# using ./configure @CONFIGURE_COMMAND_LINE@
1.9 +# Configured @DATE_WHEN_CONFIGURED@ to build for a @OPENJDK_TARGET_SYSTEM@ system,
1.10 +# using 'configure @CONFIGURE_COMMAND_LINE@'
1.11
1.12 # When calling macros, the spaces between arguments are
1.13 # often semantically important! Sometimes we need to subst
1.14 @@ -67,48 +67,50 @@
1.15 # The "human readable" name of this configuration
1.16 CONF_NAME:=@CONF_NAME@
1.17
1.18 -# The built jdk will run in this host system.
1.19 -HOST:=@HOST@
1.20 -HOST_OS:=@HOST_OS@
1.21 -HOST_OS_FAMILY:=@HOST_OS_FAMILY@
1.22 -HOST_OS_API:=@HOST_OS_API@
1.23 +# The built jdk will run in this target system.
1.24 +OPENJDK_TARGET_SYSTEM:=@OPENJDK_TARGET_SYSTEM@
1.25
1.26 -HOST_CPU:=@HOST_CPU@
1.27 -HOST_CPU_ARCH:=@HOST_CPU_ARCH@
1.28 -HOST_CPU_BITS:=@HOST_CPU_BITS@
1.29 -HOST_CPU_ENDIAN:=@HOST_CPU_ENDIAN@
1.30 +OPENJDK_TARGET_OS:=@OPENJDK_TARGET_OS@
1.31 +OPENJDK_TARGET_OS_FAMILY:=@OPENJDK_TARGET_OS_FAMILY@
1.32 +OPENJDK_TARGET_OS_API:=@OPENJDK_TARGET_OS_API@
1.33 +
1.34 +OPENJDK_TARGET_CPU:=@OPENJDK_TARGET_CPU@
1.35 +OPENJDK_TARGET_CPU_ARCH:=@OPENJDK_TARGET_CPU_ARCH@
1.36 +OPENJDK_TARGET_CPU_BITS:=@OPENJDK_TARGET_CPU_BITS@
1.37 +OPENJDK_TARGET_CPU_ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
1.38
1.39 # We are building on this build system.
1.40 -# When not cross-compiling, it is the same as the host.
1.41 -BUILD:=@BUILD@
1.42 -BUILD_OS:=@BUILD_OS@
1.43 -BUILD_OS_FAMILY:=@BUILD_OS_FAMILY@
1.44 -BUILD_OS_API:=@BUILD_OS_API@
1.45 +# When not cross-compiling, it is the same as the target.
1.46 +OPENJDK_BUILD_SYSTEM:=@OPENJDK_BUILD_SYSTEM@
1.47
1.48 -BUILD_CPU:=@BUILD_CPU@
1.49 -BUILD_CPU_ARCH:=@BUILD_CPU_ARCH@
1.50 -BUILD_CPU_BITS:=@BUILD_CPU_BITS@
1.51 -BUILD_CPU_ENDIAN:=@BUILD_CPU_ENDIAN@
1.52 +OPENJDK_BUILD_OS:=@OPENJDK_BUILD_OS@
1.53 +OPENJDK_BUILD_OS_FAMILY:=@OPENJDK_BUILD_OS_FAMILY@
1.54 +OPENJDK_BUILD_OS_API:=@OPENJDK_BUILD_OS_API@
1.55 +
1.56 +OPENJDK_BUILD_CPU:=@OPENJDK_BUILD_CPU@
1.57 +OPENJDK_BUILD_CPU_ARCH:=@OPENJDK_BUILD_CPU_ARCH@
1.58 +OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
1.59 +OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
1.60
1.61 # Legacy OS values for use in release file.
1.62 REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@
1.63 REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@
1.64
1.65 -# Old name for HOST_OS (aix,bsd,hpux,linux,macosx,solaris,windows etc)
1.66 -PLATFORM:=@HOST_OS@
1.67 -# Old name for HOST_CPU, uses i586 and amd64, instead of ia32 and x64.
1.68 -ARCH:=@LEGACY_HOST_CPU1@
1.69 +# Old name for OPENJDK_TARGET_OS (aix,bsd,hpux,linux,macosx,solaris,windows etc)
1.70 +PLATFORM:=@OPENJDK_TARGET_OS@
1.71 +# Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of ia32 and x64.
1.72 +ARCH:=@LEGACY_OPENJDK_TARGET_CPU1@
1.73 # Yet another name for arch used for an extra subdir below the jvm lib.
1.74 # Uses i386 and amd64, instead of ia32 and x64.
1.75 -LIBARCH:=@LEGACY_HOST_CPU2@
1.76 +LIBARCH:=@LEGACY_OPENJDK_TARGET_CPU2@
1.77 # Use to switch between solaris and windows subdirs in the jdk.
1.78 -LEGACY_HOST_OS_API:=@LEGACY_HOST_OS_API@
1.79 +LEGACY_OPENJDK_TARGET_OS_API:=@LEGACY_OPENJDK_TARGET_OS_API@
1.80 # 32 or 64 bit
1.81 -ARCH_DATA_MODEL:=@HOST_CPU_BITS@
1.82 +ARCH_DATA_MODEL:=@OPENJDK_TARGET_CPU_BITS@
1.83 # Legacy setting for building for a 64 bit machine.
1.84 # If yes then this expands to _LP64:=1
1.85 @LP64@
1.86 -ENDIAN:=@HOST_CPU_ENDIAN@
1.87 +ENDIAN:=@OPENJDK_TARGET_CPU_ENDIAN@
1.88 @SET_OPENJDK@
1.89 JIGSAW:=@JIGSAW@
1.90 LIBM:=-lm
1.91 @@ -185,7 +187,6 @@
1.92 # The java launcher uses the default.
1.93 # The other can be selected by specifying -client -server -kernel -zero or -zeroshark
1.94 # on the java launcher command line.
1.95 -DEFAULT_JVM_VARIANT:=@DEFAULT_JVM_VARIANT@
1.96 JVM_VARIANTS:=@JVM_VARIANTS@
1.97 JVM_VARIANT_SERVER:=@JVM_VARIANT_SERVER@
1.98 JVM_VARIANT_CLIENT:=@JVM_VARIANT_CLIENT@
1.99 @@ -202,53 +203,42 @@
1.100 # Legacy setting: -debug or -fastdebug
1.101 BUILD_VARIANT_RELEASE:=@BUILD_VARIANT_RELEASE@
1.102
1.103 -LANGTOOLS_OUTPUTDIR:=@OUTPUT_ROOT@/langtools
1.104 -LANGTOOLS_DIST:=@OUTPUT_ROOT@/langtools/dist
1.105 -LANGTOOLS_MAKE_ARGS:=@LANGTOOLS_MAKE_ARGS@
1.106 -
1.107 -CORBA_OUTPUTDIR:=@OUTPUT_ROOT@/corba
1.108 -CORBA_DIST:=@OUTPUT_ROOT@/corba/dist
1.109 -CORBA_MAKE_ARGS:=@CORBA_MAKE_ARGS@
1.110 -
1.111 -JAXP_OUTPUTDIR:=@OUTPUT_ROOT@/jaxp
1.112 -JAXP_DIST:=@OUTPUT_ROOT@/jaxp/dist
1.113 -JAXP_MAKE_ARGS:=@JAXP_MAKE_ARGS@
1.114 -
1.115 -JAXWS_OUTPUTDIR:=@OUTPUT_ROOT@/jaxws
1.116 -JAXWS_DIST:=@OUTPUT_ROOT@/jaxws/dist
1.117 -JAXWS_MAKE_ARGS:=@JAXWS_MAKE_ARGS@
1.118 -
1.119 -HOTSPOT_OUTPUTDIR:=@OUTPUT_ROOT@/hotspot
1.120 -HOTSPOT_DIST:=@OUTPUT_ROOT@/hotspot/dist
1.121 -HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@
1.122 +LANGTOOLS_OUTPUTDIR:=@LANGTOOLS_OUTPUTDIR@
1.123 +CORBA_OUTPUTDIR:=@CORBA_OUTPUTDIR@
1.124 +JAXP_OUTPUTDIR:=@JAXP_OUTPUTDIR@
1.125 +JAXWS_OUTPUTDIR:=@JAXWS_OUTPUTDIR@
1.126 +HOTSPOT_OUTPUTDIR:=@HOTSPOT_OUTPUTDIR@
1.127
1.128 # This where a working jvm is built.
1.129 # You can run $(JDK_OUTPUTDIR)/bin/java
1.130 # Though the layout of the contents of $(JDK_OUTPUTDIR) is not
1.131 # yet the same as a default installation.
1.132 -HOTSPOT_IMPORT_PATH:=@OUTPUT_ROOT@/hotspot/dist
1.133 JDK_OUTPUTDIR:=@OUTPUT_ROOT@/jdk
1.134 -JDK_MAKE_ARGS:=@JDK_MAKE_ARGS@
1.135
1.136 # When you run "make install" it will create the standardized
1.137 # layout for the jdk and the jre inside the images subdir.
1.138 # Then it will copy the contents of the jdk into the installation
1.139 # directory.
1.140 IMAGES_OUTPUTDIR:=@OUTPUT_ROOT@/images
1.141 -IMAGES_MAKE_ARGS:=@IMAGES_MAKE_ARGS@
1.142 +
1.143 +LANGTOOLS_DIST:=@LANGTOOLS_DIST@
1.144 +CORBA_DIST:=@CORBA_DIST@
1.145 +JAXP_DIST:=@JAXP_DIST@
1.146 +JAXWS_DIST:=@JAXWS_DIST@
1.147 +HOTSPOT_DIST:=@HOTSPOT_DIST@
1.148 +
1.149 # Legacy variables used by Release.gmk
1.150 JDK_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2sdk-image
1.151 JRE_IMAGE_DIR:=$(IMAGES_OUTPUTDIR)/j2re-image
1.152
1.153 # Can be /sparcv9 or /amd64 on Solaris
1.154 -ISA_DIR:=@LEGACY_HOST_CPU3@
1.155 +ISA_DIR:=@LEGACY_OPENJDK_TARGET_CPU3@
1.156 BINDIR:=$(JDK_OUTPUTDIR)/bin$(ISA_DIR)
1.157
1.158 # The boot jdk to use
1.159 ALT_BOOTDIR:=@BOOT_JDK@
1.160 BOOT_JDK:=@BOOT_JDK@
1.161 BOOT_JDK_JVMARGS:=@BOOT_JDK_JVMARGS@
1.162 -BOOT_JAVAC_ARGS:=@BOOT_JAVAC_ARGS@
1.163 BOOT_RTJAR:=@BOOT_RTJAR@
1.164 BOOT_TOOLSJAR:=@BOOT_TOOLSJAR@
1.165
1.166 @@ -258,8 +248,6 @@
1.167
1.168 # Information about the build system
1.169 NUM_CORES:=@NUM_CORES@
1.170 -# This is used from the libjvm build for C/C++ code.
1.171 -HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@
1.172 # This is used from the jdk build for C/C++ code.
1.173 PARALLEL_COMPILE_JOBS:=@CONCURRENT_BUILD_JOBS@
1.174 # Store javac server synchronization files here, and
1.175 @@ -282,6 +270,8 @@
1.176 JAVAC_USE_DEPS:=@JAVAC_USE_DEPS@
1.177 # We can invoke javac: SINGLE_THREADED_BATCH or MULTI_CORE_CONCURRENT
1.178 JAVAC_USE_MODE:=@JAVAC_USE_MODE@
1.179 +# Enable not yet complete sjavac support.
1.180 +ENABLE_SJAVAC:=@ENABLE_SJAVAC@
1.181
1.182 # The OpenJDK makefiles should be changed to using the standard
1.183 # configure output ..._CFLAGS and ..._LIBS. In the meantime we
1.184 @@ -375,22 +365,24 @@
1.185 @DEFINE_CROSS_COMPILE_ARCH@
1.186 # The HOSTCC should really be named BUILDCC, ie build executable for
1.187 # the build platform. Same as CC when not cross compiling.
1.188 -HOSTCC:=@HOSTCC@
1.189 -HOSTCXX:=@HOSTCXX@
1.190 +HOSTCC:=@UNCYGDRIVE@ @HOSTCC@
1.191 +HOSTCXX:=@UNCYGDRIVE@ @HOSTCXX@
1.192 # And of course, the jdk spells HOSTCC as NIO_CC/HOST_CC
1.193 -HOST_CC:=@HOSTCC@
1.194 -NIO_CC:=@HOSTCC@
1.195 +HOST_CC:=@UNCYGDRIVE@ @HOSTCC@
1.196 +NIO_CC:=@UNCYGDRIVE@ @HOSTCC@
1.197
1.198 -AS:=@AS@
1.199 +HOST_LD:=@UNCYGDRIVE@ @HOSTLD@
1.200 +
1.201 +AS:=@UNCYGDRIVE@ @AS@
1.202 ASFLAGS:=@ASFLAGS@
1.203
1.204 # AR is used to create a static library (is ar in posix, lib.exe in winapi)
1.205 AR:=@UNCYGDRIVE@ @AR@
1.206 ARFLAGS:=@ARFLAGS@
1.207
1.208 -NM:=@NM@
1.209 -STRIP:=@STRIP@
1.210 -MCS:=@MCS@
1.211 +NM:=@UNCYGDRIVE@ @NM@
1.212 +STRIP:=@UNCYGDRIVE@ @STRIP@
1.213 +MCS:=@UNCYGDRIVE@ @MCS@
1.214
1.215 # Command to create a shared library
1.216 SHARED_LIBRARY_FLAGS:=@SHARED_LIBRARY_FLAGS@
1.217 @@ -404,6 +396,17 @@
1.218 C_FLAG_REORDER:=@C_FLAG_REORDER@
1.219 CXX_FLAG_REORDER:=@CXX_FLAG_REORDER@
1.220
1.221 +#
1.222 +# Options for generating debug symbols
1.223 +ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
1.224 +CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
1.225 +CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
1.226 +ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
1.227 +
1.228 +#
1.229 +# Compress (or not) jars
1.230 +COMPRESS_JARS=@COMPRESS_JARS@
1.231 +
1.232 # Options to linker to specify the library name.
1.233 # (Note absence of := assignment, because we do not want to evaluate the macro body here)
1.234 SET_SHARED_LIBRARY_NAME=@SET_SHARED_LIBRARY_NAME@
1.235 @@ -507,23 +510,28 @@
1.236 EXPR:=@EXPR@
1.237 FILE:=@FILE@
1.238 HG:=@HG@
1.239 +OBJCOPY:=@OBJCOPY@
1.240
1.241 UNCYGDRIVE:=@UNCYGDRIVE@
1.242
1.243 # Where the build output is stored for your convenience.
1.244 BUILD_LOG:=@BUILD_LOG@
1.245 +BUILD_LOG_PREVIOUS:=@BUILD_LOG_PREVIOUS@
1.246 BUILD_LOG_WRAPPER:=@BUILD_LOG_WRAPPER@
1.247
1.248 # Build setup
1.249 ENABLE_DOCS:=@ENABLE_DOCS@
1.250 GENERATE_DOCS:=@ENABLE_DOCS@
1.251 DISABLE_NIMBUS:=@DISABLE_NIMBUS@
1.252 +ENABLE_JFR=@ENABLE_JFR@
1.253 USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
1.254 USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@
1.255 USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@
1.256 +LIBZIP_CAN_USE_MMAP:=@LIBZIP_CAN_USE_MMAP@
1.257 CHECK_FOR_VCINSTALLDIR=@CHECK_FOR_VCINSTALLDIR@
1.258 MSVCRNN_DLL:=@MSVCR100DLL@
1.259
1.260 +
1.261 # ADD_SRCS takes a single argument with source roots
1.262 # and appends any corresponding source roots found
1.263 # below --with-add-source-root and below
1.264 @@ -553,6 +561,17 @@
1.265
1.266 ####################################################
1.267 #
1.268 +# Legacy Hotspot support
1.269 +
1.270 +HOTSPOT_DIST:=@HOTSPOT_DIST@
1.271 +HOTSPOT_MAKE_ARGS:=@HOTSPOT_MAKE_ARGS@
1.272 +# This is used from the libjvm build for C/C++ code.
1.273 +HOTSPOT_BUILD_JOBS:=@CONCURRENT_BUILD_JOBS@
1.274 +# Control wether Hotspot runs Queens test after building
1.275 +TEST_IN_BUILD=@TEST_IN_BUILD@
1.276 +
1.277 +####################################################
1.278 +#
1.279 # INSTALLATION
1.280 #
1.281
1.282 @@ -611,10 +630,9 @@
1.283 # Name of Service Agent library
1.284 SALIB_NAME=@SALIB_NAME@
1.285
1.286 -# Control wether Hotspot runs Queens test after building
1.287 -TEST_IN_BUILD=@TEST_IN_BUILD@
1.288 -
1.289 OS_VERSION_MAJOR:=@OS_VERSION_MAJOR@
1.290 OS_VERSION_MINOR:=@OS_VERSION_MINOR@
1.291 OS_VERSION_MICRO:=@OS_VERSION_MICRO@
1.292
1.293 +# Include the closed-spec.gmk file if it exists
1.294 +-include $(dir @SPEC@)/closed-spec.gmk
