changeset 2828:c28ca694db97

Merge
author prr
date Thu, 31 Aug 2017 10:49:47 -0700
parents 6e6404f32f75 8625e8491887
children b32db08bea9a
files
diffstat 4 files changed, 23 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/flags.m4	Tue Aug 29 10:48:58 2017 -0700
+++ b/common/autoconf/flags.m4	Thu Aug 31 10:49:47 2017 -0700
@@ -1358,7 +1358,7 @@
       $2SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1"
     fi
     $2JVM_LIBS="[$]$2JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \
-        -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt"
+        -lthread -ldoor -lc -ldemangle -lnsl -lrt"
   elif test "x$OPENJDK_$1_OS" = xmacosx; then
     $2JVM_LIBS="[$]$2JVM_LIBS -lm"
   elif test "x$OPENJDK_$1_OS" = xaix; then
--- a/common/autoconf/generated-configure.sh	Tue Aug 29 10:48:58 2017 -0700
+++ b/common/autoconf/generated-configure.sh	Thu Aug 31 10:49:47 2017 -0700
@@ -5151,7 +5151,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1503949566
+DATE_WHEN_GENERATED=1504187184
 
 ###############################################################################
 #
@@ -16141,6 +16141,12 @@
   elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     # On all platforms except MacOSX replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_LEGACY="amd64"
+  elif test "x$OPENJDK_TARGET_CPU" = xalpha; then
+    # Avoid name collisions with variables named alpha
+    OPENJDK_TARGET_CPU_LEGACY="_alpha_"
+  elif test "x$OPENJDK_TARGET_CPU" = xsh; then
+    # Avoid name collisions with variables named sh
+    OPENJDK_TARGET_CPU_LEGACY="_sh_"
   fi
 
 
@@ -16293,6 +16299,12 @@
   elif test "x$OPENJDK_BUILD_OS" != xmacosx && test "x$OPENJDK_BUILD_CPU" = xx86_64; then
     # On all platforms except MacOSX replace x86_64 with amd64.
     OPENJDK_BUILD_CPU_LEGACY="amd64"
+  elif test "x$OPENJDK_BUILD_CPU" = xalpha; then
+    # Avoid name collisions with variables named alpha
+    OPENJDK_BUILD_CPU_LEGACY="_alpha_"
+  elif test "x$OPENJDK_BUILD_CPU" = xsh; then
+    # Avoid name collisions with variables named sh
+    OPENJDK_BUILD_CPU_LEGACY="_sh_"
   fi
 
 
@@ -52064,7 +52076,7 @@
       SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1"
     fi
     JVM_LIBS="$JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \
-        -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt"
+        -lthread -ldoor -lc -ldemangle -lnsl -lrt"
   elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
     JVM_LIBS="$JVM_LIBS -lm"
   elif test "x$OPENJDK_TARGET_OS" = xaix; then
@@ -52943,7 +52955,7 @@
       OPENJDK_BUILD_SOLARIS_LIBM_LIBS="/usr/lib/sparcv9/libm.so.1"
     fi
     OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lsocket -lsched -ldl $SOLARIS_LIBM_LIBS -lCrun \
-        -lthread -ldoor -lc -ldemangle -lnsl -lkstat -lrt"
+        -lthread -ldoor -lc -ldemangle -lnsl -lrt"
   elif test "x$OPENJDK_BUILD_OS" = xmacosx; then
     OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm"
   elif test "x$OPENJDK_BUILD_OS" = xaix; then
--- a/common/autoconf/platform.m4	Tue Aug 29 10:48:58 2017 -0700
+++ b/common/autoconf/platform.m4	Thu Aug 31 10:49:47 2017 -0700
@@ -337,6 +337,12 @@
   elif test "x$OPENJDK_$1_OS" != xmacosx && test "x$OPENJDK_$1_CPU" = xx86_64; then
     # On all platforms except MacOSX replace x86_64 with amd64.
     OPENJDK_$1_CPU_LEGACY="amd64"
+  elif test "x$OPENJDK_$1_CPU" = xalpha; then
+    # Avoid name collisions with variables named alpha
+    OPENJDK_$1_CPU_LEGACY="_alpha_"
+  elif test "x$OPENJDK_$1_CPU" = xsh; then
+    # Avoid name collisions with variables named sh
+    OPENJDK_$1_CPU_LEGACY="_sh_"
   fi
   AC_SUBST(OPENJDK_$1_CPU_LEGACY)
 
--- a/common/conf/jib-profiles.js	Tue Aug 29 10:48:58 2017 -0700
+++ b/common/conf/jib-profiles.js	Thu Aug 31 10:49:47 2017 -0700
@@ -200,7 +200,7 @@
     data.configuration_make_arg = "CONF_NAME=";
 
     // Exclude list to use when Jib creates a source bundle
-    data.src_bundle_excludes = "./build webrev .hg */.hg */*/.hg */*/*/.hg";
+    data.src_bundle_excludes = "./build webrev* */webrev* */*/webrev* */*/*/webrev* .hg */.hg */*/.hg */*/*/.hg";
     // Include list to use when creating a minimal jib source bundle which
     // contains just the jib configuration files.
     data.conf_bundle_includes = "*/conf/jib-profiles.* common/autoconf/version-numbers"