Mercurial > hg > openjdk > jdk9
changeset 2528:277c9c31206f
Merge
| author | alanb |
|---|---|
| date | Wed, 22 Mar 2017 18:41:16 +0000 |
| parents | d4d6daaef6f1 (current diff) 16d1c3ff3d0e (diff) |
| children | c38c6b270ccc |
| files | common/autoconf/generated-configure.sh |
| diffstat | 5 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Tue Mar 21 08:48:29 2017 -0700 +++ b/common/autoconf/generated-configure.sh Wed Mar 22 18:41:16 2017 +0000 @@ -994,6 +994,7 @@ OPENJDK_TARGET_CPU_LEGACY_LIB OPENJDK_TARGET_CPU_LEGACY REQUIRED_OS_VERSION +REQUIRED_OS_ARCH REQUIRED_OS_NAME COMPILE_TYPE OPENJDK_TARGET_CPU_ENDIAN @@ -5173,7 +5174,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1489410066 +DATE_WHEN_GENERATED=1490200383 ############################################################################### # @@ -16038,13 +16039,15 @@ fi fi if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - REQUIRED_OS_NAME=Darwin + REQUIRED_OS_NAME="Mac OS X" REQUIRED_OS_VERSION=11.2 fi if test "x$OPENJDK_TARGET_OS" = "xaix"; then REQUIRED_OS_NAME=AIX REQUIRED_OS_VERSION=7.1 fi + REQUIRED_OS_ARCH=${OPENJDK_TARGET_CPU} +
--- a/common/autoconf/platform.m4 Tue Mar 21 08:48:29 2017 -0700 +++ b/common/autoconf/platform.m4 Wed Mar 22 18:41:16 2017 +0000 @@ -452,15 +452,17 @@ fi fi if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then - REQUIRED_OS_NAME=Darwin + REQUIRED_OS_NAME="Mac OS X" REQUIRED_OS_VERSION=11.2 fi if test "x$OPENJDK_TARGET_OS" = "xaix"; then REQUIRED_OS_NAME=AIX REQUIRED_OS_VERSION=7.1 fi + REQUIRED_OS_ARCH=${OPENJDK_TARGET_CPU} AC_SUBST(REQUIRED_OS_NAME) + AC_SUBST(REQUIRED_OS_ARCH) AC_SUBST(REQUIRED_OS_VERSION) ])
--- a/common/autoconf/spec.gmk.in Tue Mar 21 08:48:29 2017 -0700 +++ b/common/autoconf/spec.gmk.in Wed Mar 22 18:41:16 2017 +0000 @@ -101,8 +101,9 @@ OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@ OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@ -# Legacy OS values for use in release file. +# OS values for use in release file. REQUIRED_OS_NAME:=@REQUIRED_OS_NAME@ +REQUIRED_OS_ARCH:=@REQUIRED_OS_ARCH@ REQUIRED_OS_VERSION:=@REQUIRED_OS_VERSION@ LIBM:=@LIBM@
--- a/make/CreateJmods.gmk Tue Mar 21 08:48:29 2017 -0700 +++ b/make/CreateJmods.gmk Wed Mar 22 18:41:16 2017 +0000 @@ -135,9 +135,8 @@ $(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@) $(JMOD) create \ --module-version $(VERSION_SHORT) \ - --os-name $(REQUIRED_OS_NAME) \ - --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ - --os-version $(REQUIRED_OS_VERSION) \ + --os-name '$(REQUIRED_OS_NAME)' \ + --os-arch '$(REQUIRED_OS_ARCH)' \ --module-path $(JMODS_DIR) \ --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \ $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@)
--- a/make/Images.gmk Tue Mar 21 08:48:29 2017 -0700 +++ b/make/Images.gmk Wed Mar 22 18:41:16 2017 +0000 @@ -119,6 +119,7 @@ --module-path $(IMAGES_OUTPUTDIR)/jmods \ --endian $(OPENJDK_BUILD_CPU_ENDIAN) \ --release-info $(BASE_RELEASE_FILE) \ + --release-info add:OS_VERSION=\"$(REQUIRED_OS_VERSION)\" \ --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \ --dedup-legal-notices=error-if-not-same-content \ $(JLINK_JLI_CLASSES) \