changeset 3084:7e790234d48f

Replace jmod --os-name/--os-arch option with --target-platform
author mchung
date Wed, 26 Apr 2017 19:28:40 -0700
parents f5ba193588e2
children 4f7d418ba4c8
files common/autoconf/generated-configure.sh common/autoconf/platform.m4 common/autoconf/spec.gmk.in make/CreateJmods.gmk
diffstat 4 files changed, 8 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Wed Apr 26 14:10:03 2017 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Apr 26 19:28:40 2017 -0700
@@ -993,8 +993,7 @@
 OPENJDK_TARGET_CPU_ISADIR
 OPENJDK_TARGET_CPU_LEGACY_LIB
 OPENJDK_TARGET_CPU_LEGACY
-OPENJDK_MODULE_TARGET_OS_ARCH
-OPENJDK_MODULE_TARGET_OS_NAME
+OPENJDK_MODULE_TARGET_PLATFORM
 COMPILE_TYPE
 OPENJDK_TARGET_CPU_ENDIAN
 OPENJDK_TARGET_CPU_BITS
@@ -5173,7 +5172,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1493211772
+DATE_WHEN_GENERATED=1493249579
 
 ###############################################################################
 #
@@ -16033,7 +16032,7 @@
     OPENJDK_MODULE_TARGET_OS_ARCH="$OPENJDK_TARGET_CPU"
   fi
 
-
+  OPENJDK_MODULE_TARGET_PLATFORM="${OPENJDK_MODULE_TARGET_OS_NAME}-${OPENJDK_MODULE_TARGET_OS_ARCH}"
 
 
 
--- a/common/autoconf/platform.m4	Wed Apr 26 14:10:03 2017 +0100
+++ b/common/autoconf/platform.m4	Wed Apr 26 19:28:40 2017 -0700
@@ -447,8 +447,8 @@
     OPENJDK_MODULE_TARGET_OS_ARCH="$OPENJDK_TARGET_CPU"
   fi
 
-  AC_SUBST(OPENJDK_MODULE_TARGET_OS_NAME)
-  AC_SUBST(OPENJDK_MODULE_TARGET_OS_ARCH)
+  OPENJDK_MODULE_TARGET_PLATFORM="${OPENJDK_MODULE_TARGET_OS_NAME}-${OPENJDK_MODULE_TARGET_OS_ARCH}"
+  AC_SUBST(OPENJDK_MODULE_TARGET_PLATFORM)
 ])
 
 #%%% Build and target systems %%%
--- a/common/autoconf/spec.gmk.in	Wed Apr 26 14:10:03 2017 +0100
+++ b/common/autoconf/spec.gmk.in	Wed Apr 26 19:28:40 2017 -0700
@@ -101,9 +101,8 @@
 OPENJDK_BUILD_CPU_BITS:=@OPENJDK_BUILD_CPU_BITS@
 OPENJDK_BUILD_CPU_ENDIAN:=@OPENJDK_BUILD_CPU_ENDIAN@
 
-# OS values for use in ModuleTarget class file attribute.
-OPENJDK_MODULE_TARGET_OS_NAME:=@OPENJDK_MODULE_TARGET_OS_NAME@
-OPENJDK_MODULE_TARGET_OS_ARCH:=@OPENJDK_MODULE_TARGET_OS_ARCH@
+# Target platform value in ModuleTarget class file attribute.
+OPENJDK_MODULE_TARGET_PLATFORM:=@OPENJDK_MODULE_TARGET_PLATFORM@
 
 LIBM:=@LIBM@
 LIBDL:=@LIBDL@
--- a/make/CreateJmods.gmk	Wed Apr 26 14:10:03 2017 +0100
+++ b/make/CreateJmods.gmk	Wed Apr 26 19:28:40 2017 -0700
@@ -135,8 +135,7 @@
 	$(RM) $@ $(JMODS_TEMPDIR)/$(notdir $@)
 	$(JMOD) create \
             --module-version $(VERSION_SHORT) \
-            --os-name '$(OPENJDK_MODULE_TARGET_OS_NAME)' \
-            --os-arch '$(OPENJDK_MODULE_TARGET_OS_ARCH)' \
+            --target-platform '$(OPENJDK_MODULE_TARGET_PLATFORM)' \
             --module-path $(JMODS_DIR) \
 	    --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}' \
 	    $(JMOD_FLAGS) $(JMODS_TEMPDIR)/$(notdir $@)