# HG changeset patch
# User duke
# Date 1499277943 -7200
# Node ID 61c8e362c4a1396b04b5f94713a5cf20372cc8d7
# Parent 8cc25b0f95a0c45cfeebbeb2b1d2e1836e7d5b61# Parent 5c664a8f66d02073f02e0635197720f63c5f0af9
Merge
diff -r 8cc25b0f95a0 -r 61c8e362c4a1 .hgtags-top-repo
--- a/.hgtags-top-repo Thu Oct 30 13:57:02 2014 -0700
+++ b/.hgtags-top-repo Wed Jul 05 20:05:43 2017 +0200
@@ -279,3 +279,4 @@
087b23f35631e68e950496a36fce8ccca612966a jdk9-b34
c173ba994245380fb11ef077d1e59823386840eb jdk9-b35
201d4e235d597a25a2d3ee1404394789ba386119 jdk9-b36
+723a67b0c442391447b1d8aad8b249d06d1032e8 jdk9-b37
diff -r 8cc25b0f95a0 -r 61c8e362c4a1 common/autoconf/flags.m4
--- a/common/autoconf/flags.m4 Thu Oct 30 13:57:02 2014 -0700
+++ b/common/autoconf/flags.m4 Wed Jul 05 20:05:43 2017 +0200
@@ -136,8 +136,8 @@
SYSROOT_CFLAGS="-isysroot \"$SYSROOT\" -iframework\"$SYSROOT/System/Library/Frameworks\""
SYSROOT_LDFLAGS=$SYSROOT_CFLAGS
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
- SYSROOT_CFLAGS="--sysroot=\"$SYSROOT\""
- SYSROOT_LDFLAGS="--sysroot=\"$SYSROOT\""
+ SYSROOT_CFLAGS="--sysroot=$SYSROOT"
+ SYSROOT_LDFLAGS="--sysroot=$SYSROOT"
elif test "x$TOOLCHAIN_TYPE" = xclang; then
SYSROOT_CFLAGS="-isysroot \"$SYSROOT\""
SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
diff -r 8cc25b0f95a0 -r 61c8e362c4a1 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh Thu Oct 30 13:57:02 2014 -0700
+++ b/common/autoconf/generated-configure.sh Wed Jul 05 20:05:43 2017 +0200
@@ -4328,7 +4328,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1413533532
+DATE_WHEN_GENERATED=1414663067
###############################################################################
#
@@ -41681,8 +41681,8 @@
SYSROOT_CFLAGS="-isysroot \"$SYSROOT\" -iframework\"$SYSROOT/System/Library/Frameworks\""
SYSROOT_LDFLAGS=$SYSROOT_CFLAGS
elif test "x$TOOLCHAIN_TYPE" = xgcc; then
- SYSROOT_CFLAGS="--sysroot=\"$SYSROOT\""
- SYSROOT_LDFLAGS="--sysroot=\"$SYSROOT\""
+ SYSROOT_CFLAGS="--sysroot=$SYSROOT"
+ SYSROOT_LDFLAGS="--sysroot=$SYSROOT"
elif test "x$TOOLCHAIN_TYPE" = xclang; then
SYSROOT_CFLAGS="-isysroot \"$SYSROOT\""
SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
@@ -44037,17 +44037,6 @@
-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
fi
- #
- # Weird Sol10 something check...TODO change to try compile
- #
- if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
- if test "`uname -r`" = "5.10"; then
- if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
- X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
- fi
- fi
- fi
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -44055,7 +44044,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
OLD_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $X_CFLAGS"
+ CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
@@ -44079,6 +44068,31 @@
done
+ # If XLinearGradient isn't available in Xrender.h, signal that it needs to be
+ # defined in libawt_xawt.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if XlinearGradient is defined in Xrender.h" >&5
+$as_echo_n "checking if XlinearGradient is defined in Xrender.h... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <X11/extensions/Xrender.h>
+int
+main ()
+{
+XLinearGradient x;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
CFLAGS="$OLD_CFLAGS"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
diff -r 8cc25b0f95a0 -r 61c8e362c4a1 common/autoconf/libraries.m4
--- a/common/autoconf/libraries.m4 Thu Oct 30 13:57:02 2014 -0700
+++ b/common/autoconf/libraries.m4 Wed Jul 05 20:05:43 2017 +0200
@@ -139,20 +139,9 @@
-R$OPENWIN_HOME/lib$OPENJDK_TARGET_CPU_ISADIR"
fi
- #
- # Weird Sol10 something check...TODO change to try compile
- #
- if test "x${OPENJDK_TARGET_OS}" = xsolaris; then
- if test "`uname -r`" = "5.10"; then
- if test "`${EGREP} -c XLinearGradient ${OPENWIN_HOME}/share/include/X11/extensions/Xrender.h`" = "0"; then
- X_CFLAGS="${X_CFLAGS} -DSOLARIS10_NO_XRENDER_STRUCTS"
- fi
- fi
- fi
-
AC_LANG_PUSH(C)
OLD_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $X_CFLAGS"
+ CFLAGS="$CFLAGS $SYSROOT_CFLAGS $X_CFLAGS"
# Need to include Xlib.h and Xutil.h to avoid "present but cannot be compiled" warnings on Solaris 10
AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
@@ -164,6 +153,16 @@
]
)
+ # If XLinearGradient isn't available in Xrender.h, signal that it needs to be
+ # defined in libawt_xawt.
+ AC_MSG_CHECKING([if XlinearGradient is defined in Xrender.h])
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[#include <X11/extensions/Xrender.h>]],
+ [[XLinearGradient x;]])],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ X_CFLAGS="$X_CFLAGS -DSOLARIS10_NO_XRENDER_STRUCTS"])
+
CFLAGS="$OLD_CFLAGS"
AC_LANG_POP(C)
diff -r 8cc25b0f95a0 -r 61c8e362c4a1 make/CompileJavaModules.gmk
--- a/make/CompileJavaModules.gmk Thu Oct 30 13:57:02 2014 -0700
+++ b/make/CompileJavaModules.gmk Wed Jul 05 20:05:43 2017 +0200
@@ -42,7 +42,7 @@
################################################################################
-java.base_COPY := .icu .dat .spp content-types.properties
+java.base_COPY := .icu .dat .spp content-types.properties hijrah-config-islamic-umalqura.properties
java.base_CLEAN := intrinsic.properties
java.base_EXCLUDES += java/lang/doc-files