changeset 2381:cb8f12bf1e86 jdk8u121-b13-aarch32-170210

Merge
author snazarki
date Thu, 09 Feb 2017 19:30:13 +0300
parents 2dd4c1dba7a3 (diff) f2b5b6ab1f55 (current diff)
children 1d7bea5ae5d3
files .hgtags
diffstat 10 files changed, 140 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Dec 05 13:09:07 2016 -0800
+++ b/.hgtags	Thu Feb 09 19:30:13 2017 +0300
@@ -572,6 +572,7 @@
 08dc508915433fdf3d970ea4d2fd33b4dffd67ca jdk8u77-b31
 4c41657db1862352b0e107b910be32c86eb5b1ff jdk8u91-b00
 0c798868f18548af144de0f0ab69f09a4c968cd2 jdk8u91-b13
+4f7190b27caad1aaf7c033b280dc11fa3b1465d9 jdk8u91-b14-aarch32-160510
 5744173381186940733aecf7904053ba6e83180e jdk8u91-b14
 dca1ae1fd0fdb55a4fa12f58726a1fa7086e7ae0 jdk8u91-b15
 e8bed1496ff254d91d52c8da7c6d8d361862d773 jdk8u76-b00
@@ -628,6 +629,8 @@
 5839c5f4292a8755a4c102cb0f983536f5bfe8be jdk8u102-b11
 163dc486915300b020f203e89fdf1985cc3c4814 jdk8u102-b12
 04471bfd1cc2e8f4d8d198e79b21e64dd4499db8 jdk8u102-b13
+18c380fead4d3d4f18061881246cacead576150d jdk8u102-b14-aarch32-160812
+2c56ff57079cfbe273383b2c6c37b27a1128571a jdk8u-core-final
 daafd7d3a76a0c448e4982afd7c4e9471ab1c916 jdk8u102-b14
 3a3064f9363c79f70a0d9b2201342acc880e1e76 jdk8u102-b31
 fb4fc26136253424c0a4f4f5a10dc54f612b64fd jdk8u102-b32
@@ -665,6 +668,7 @@
 b4441c5520688b42c52caa36861744429ec4385a jdk8u112-b14
 bfb88850a367a747e77f4cb164a12ea54ec8e8da jdk8u112-b15
 14388b14d4847c3eacce677eae37980e6fa545cd jdk8u112-b16
+c2524804b4a742a61770174d84346f81d4979496 jdk8u112-b16-aarch32-161109
 1a7a5fe22a028e438a724d909d27da2ea96c6d86 jdk8u112-b31
 58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00
 a2c5309f998f8aa207a6e381464263e9a7dd50e0 jdk8u121-b01
--- a/.jcheck/conf	Mon Dec 05 13:09:07 2016 -0800
+++ b/.jcheck/conf	Thu Feb 09 19:30:13 2017 +0300
@@ -1,2 +1,4 @@
 project=jdk8
 bugids=dup
+comments=lax
+tags=lax
--- a/common/autoconf/build-aux/config.sub	Mon Dec 05 13:09:07 2016 -0800
+++ b/common/autoconf/build-aux/config.sub	Thu Feb 09 19:30:13 2017 +0300
@@ -29,36 +29,43 @@
 
 DIR=`dirname $0`
 
-# First, filter out everything that doesn't begin with "aarch64-"
-if ! echo $* | grep '^aarch64-' >/dev/null ; then
+# First, filter out everything that doesn't begin with "aarch32-" or "aarch64-"
+if ! echo $* | grep -E '^(aarch32-|aarch64-)' >/dev/null; then
     . $DIR/autoconf-config.sub "$@"
     # autoconf-config.sub exits, so we never reach here, but just in
     # case we do:
     exit
 fi
 
-while test $# -gt 0 ; do
-    case $1 in 
-        -- )   # Stop option processing
+original="arm-"
+
+while test $# -gt 0; do
+    case $1 in
+        --) # Stop option processing
             shift; break ;;
-        aarch64-* )
+        aarch32-*)
+            config=`echo $1 | sed 's/^aarch32-/arm-/'`
+            sub_args="$sub_args $config"
+            original="aarch32-"
+            shift ;;
+        aarch64-*)
             config=`echo $1 | sed 's/^aarch64-/arm-/'`
             sub_args="$sub_args $config"
-            shift; ;;
-        - )    # Use stdin as input.
+            original="aarch64-"
+            shift ;;
+        -) # Use stdin as input
             sub_args="$sub_args $1"
             shift; break ;;
-        * )
+        *)
             sub_args="$sub_args $1"
-            shift; ;;
+            shift ;;
     esac
 done
 
 result=`. $DIR/autoconf-config.sub $sub_args "$@"`
 exitcode=$?
 
-result=`echo $result | sed "s/^arm-/aarch64-/"`
+result=`echo $result | sed "s/^arm-/$original/"`
 
 echo $result
 exit $exitcode
-
--- a/common/autoconf/generated-configure.sh	Mon Dec 05 13:09:07 2016 -0800
+++ b/common/autoconf/generated-configure.sh	Thu Feb 09 19:30:13 2017 +0300
@@ -3880,7 +3880,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1449096260
+DATE_WHEN_GENERATED=1476265373
 
 ###############################################################################
 #
@@ -6825,8 +6825,14 @@
       VAR_CPU_ENDIAN=little
       ;;
     arm*)
-      VAR_CPU=arm
-      VAR_CPU_ARCH=arm
+      VAR_CPU=aarch32
+      VAR_CPU_ARCH=aarch32
+      VAR_CPU_BITS=32
+      VAR_CPU_ENDIAN=little
+      ;;
+    aarch32)
+      VAR_CPU=aarch32
+      VAR_CPU_ARCH=aarch32
       VAR_CPU_BITS=32
       VAR_CPU_ENDIAN=little
       ;;
@@ -6962,8 +6968,14 @@
       VAR_CPU_ENDIAN=little
       ;;
     arm*)
-      VAR_CPU=arm
-      VAR_CPU_ARCH=arm
+      VAR_CPU=aarch32
+      VAR_CPU_ARCH=aarch32
+      VAR_CPU_BITS=32
+      VAR_CPU_ENDIAN=little
+      ;;
+    aarch32)
+      VAR_CPU=aarch32
+      VAR_CPU_ARCH=aarch32
       VAR_CPU_BITS=32
       VAR_CPU_ENDIAN=little
       ;;
@@ -7169,6 +7181,8 @@
   elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_OSARCH="amd64"
+  elif test "x$OPENJDK_TARGET_CPU" = xaarch32; then
+    OPENJDK_TARGET_CPU_OSARCH="arm"
   fi
 
 
@@ -7978,13 +7992,16 @@
 
 
   INCLUDE_SA=true
-  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
+  if test "x$JVM_VARIANT_ZERO" = xtrue; then
+    INCLUDE_SA=false
+  fi
+  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
     INCLUDE_SA=false
   fi
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
+  if test "x$OPENJDK_TARGET_CPU" = xppc64; then
     INCLUDE_SA=false
   fi
-  if test "x$VAR_CPU" = xppc64 ; then
+  if test "x$OPENJDK_TARGET_CPU" = xaarch32; then
     INCLUDE_SA=false
   fi
   if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
@@ -29667,7 +29684,7 @@
   #
   case $COMPILER_NAME in
     gcc )
-      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
+      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \
       -pipe \
       -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
       case $OPENJDK_TARGET_CPU_ARCH in
--- a/common/autoconf/jdk-options.m4	Mon Dec 05 13:09:07 2016 -0800
+++ b/common/autoconf/jdk-options.m4	Thu Feb 09 19:30:13 2017 +0300
@@ -152,13 +152,16 @@
   AC_SUBST(JVM_VARIANT_CORE)
 
   INCLUDE_SA=true
-  if test "x$JVM_VARIANT_ZERO" = xtrue ; then
+  if test "x$JVM_VARIANT_ZERO" = xtrue; then
     INCLUDE_SA=false
   fi
-  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
+  if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
     INCLUDE_SA=false
   fi
-  if test "x$VAR_CPU" = xppc64 ; then
+  if test "x$OPENJDK_TARGET_CPU" = xppc64; then
+    INCLUDE_SA=false
+  fi
+  if test "x$OPENJDK_TARGET_CPU" = xaarch32; then
     INCLUDE_SA=false
   fi
   if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
--- a/common/autoconf/platform.m4	Mon Dec 05 13:09:07 2016 -0800
+++ b/common/autoconf/platform.m4	Thu Feb 09 19:30:13 2017 +0300
@@ -43,8 +43,14 @@
       VAR_CPU_ENDIAN=little
       ;;
     arm*)
-      VAR_CPU=arm
-      VAR_CPU_ARCH=arm
+      VAR_CPU=aarch32
+      VAR_CPU_ARCH=aarch32
+      VAR_CPU_BITS=32
+      VAR_CPU_ENDIAN=little
+      ;;
+    aarch32)
+      VAR_CPU=aarch32
+      VAR_CPU_ARCH=aarch32
       VAR_CPU_BITS=32
       VAR_CPU_ENDIAN=little
       ;;
@@ -314,6 +320,8 @@
   elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     # On all platforms except macosx, we replace x86_64 with amd64.
     OPENJDK_TARGET_CPU_OSARCH="amd64"
+  elif test "x$OPENJDK_TARGET_CPU" = xaarch32; then
+    OPENJDK_TARGET_CPU_OSARCH="arm"
   fi
   AC_SUBST(OPENJDK_TARGET_CPU_OSARCH)
 
--- a/common/autoconf/toolchain.m4	Mon Dec 05 13:09:07 2016 -0800
+++ b/common/autoconf/toolchain.m4	Thu Feb 09 19:30:13 2017 +0300
@@ -957,7 +957,7 @@
   #
   case $COMPILER_NAME in
     gcc )
-      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-parentheses \
+      CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses \
       -pipe \
       -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
       case $OPENJDK_TARGET_CPU_ARCH in
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cross-pkg-config	Thu Feb 09 19:30:13 2017 +0300
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Wrapper script that calls the real pkg-config with the relocated
+# sysroot location
+#
+# Wrapper derived from raspberry crosstool and modified to take SYSROOT
+# env variable from outside instead of computing via gcc -print-sysroot,
+# which produces wrong output if called without CFLAGS which contain --sysroot
+# Computing with CFLAGS not used, as pkg-config, in general, should not rely 
+# on CC, CFLAGS, ...
+# However, we need to CC env defined to compute pkg-config-real executable.
+# CC could be not used, if this script placed in raspberry crosstool's bin/.
+ 
+set -e
+
+if [ ! $SYSROOT ] || [ ! $CC ]; then
+	echo "No SYSROOT or CC env defined, exiting"
+	exit 1
+fi
+
+GCC="$CC"
+MACHINE=`"$GCC" -dumpmachine`
+
+#GCC could contain version like xxx-gcc-4.8.3, assuming xxx is equal to machine name
+PKG_CONFIG_REAL=${GCC%$MACHINE-*}$MACHINE-pkg-config-real
+
+export PKG_CONFIG_DIR=
+export PKG_CONFIG_LIBDIR="${SYSROOT}/usr/lib/${MACHINE}/pkgconfig":"${SYSROOT}/usr/lib/pkgconfig":"${SYSROOT}/usr/share/pkgconfig"
+export PKG_CONFIG_SYSROOT_DIR="${SYSROOT}"
+
+exec $PKG_CONFIG_REAL "$@"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cross_configure.sh	Thu Feb 09 19:30:13 2017 +0300
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -v
+
+LDFLAGS="--sysroot=$RASPI_ROOT"  \
+CFLAGS="--sysroot=$RASPI_ROOT"  \
+CXXFLAGS="--sysroot=$RASPI_ROOT"  \
+PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$RASPI_ROOT/usr/lib/arm-linux-gnueabihf/pkgconfig"  \
+PKG_CONFIG=$PWD/cross-pkg-config \
+SYSROOT=$RASPI_ROOT \
+bash configure  \
+	CC=arm-linux-gnueabihf-gcc  \
+	CXX=arm-linux-gnueabihf-g++  \
+	BUILD_CC=gcc  \
+	BUILD_LD=gcc  \
+	--with-sys-root=$RASPI_ROOT \
+	--with-freetype-include=$RASPI_ROOT/usr/include/freetype2/  \
+	--with-freetype-lib=$RASPI_ROOT/usr/lib/arm-linux-gnueabihf  \
+	--x-includes=$RASPI_ROOT/usr/include/  \
+	--x-libraries=$RASPI_ROOT/usr/lib  \
+	--disable-precompiled-headers \
+	--with-extra-cflags=--sysroot=$RASPI_ROOT \
+	--with-extra-cxxflags=--sysroot=$RASPI_ROOT \
+	--with-extra-ldflags=--sysroot=$RASPI_ROOT \
+	--openjdk-target=aarch32-linux-gnueabihf \
+	"$@"
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cross_make.sh	Thu Feb 09 19:30:13 2017 +0300
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -v
+
+CFLAGS="--sysroot=$RASPI_ROOT"  \
+CXXFLAGS="--sysroot=$RASPI_ROOT"  \
+LDFLAGS="--sysroot=$RASPI_ROOT"  \
+BUILD_LD=gcc \
+make \
+    OBJCOPY=/opt/raspi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-objcopy \
+    STRIP=/opt/raspi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-strip \
+    POST_STRIP_CMD="/opt/raspi/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin/arm-linux-gnueabihf-strip -g" \
+	BUILD_LD=gcc \
+	"$@"