[aarch64-port-dev ] RFR: merge jdk8 up to jdk8u45-b14

[Edward Nevill]

Hi,

The following webrevs merge the the aarch64 jdk8 tree up to jdk8u45-b14.

http://openjdk.linaro.org/merge_u45_b14/corba/webrev/
http://openjdk.linaro.org/merge_u45_b14/hotspot/webrev/
http://openjdk.linaro.org/merge_u45_b14/jaxp/webrev/
http://openjdk.linaro.org/merge_u45_b14/jaxws/webrev/
http://openjdk.linaro.org/merge_u45_b14/jdk/webrev/
http://openjdk.linaro.org/merge_u45_b14/jdk8/webrev/
http://openjdk.linaro.org/merge_u45_b14/langtools/webrev/


Tested with jtreg hotspot and langtools

Before:

hotspot: Test results: passed: 662; failed: 7
langtools: Test results: passed: 3,069; error: 4

After

hotspot: Test results: passed: 662; failed: 7
langtools: Test results: passed: 3,069; error: 4

I have also built and smoke tested the following build options:-

- client
- zero
- fastdebug
- slowdebug
- builtin sim
- cross compile
- native

The changes below are the aarch64 specific changes

OK to push?
Ed.

--- jdk changes --------------------------------------------------------
# HG changeset patch
# User enevill
# Date 1429193152 -3600
#      Thu Apr 16 15:05:52 2015 +0100
# Node ID 2627c4dba1df9a09a76663d2fdf7cac8b20b191e
# Parent  8ee42e32cba3a252cd6d7a79b5016bf414d34080
Fix build for aarch64.

diff -r 8ee42e32cba3 -r 2627c4dba1df src/share/native/sun/awt/libpng/pngpriv.h
--- a/src/share/native/sun/awt/libpng/pngpriv.h	Thu Apr 16 11:37:04 2015 +0100
+++ b/src/share/native/sun/awt/libpng/pngpriv.h	Thu Apr 16 15:05:52 2015 +0100
@@ -151,8 +151,8 @@
     * Note that gcc-4.9 defines __ARM_NEON instead of __ARM_NEON__, so we
     * check both variants.
     */
-#  if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
-   defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#  if ((defined(__ARM_NEON__) || defined(__ARM_NEON)) && \
+   defined(PNG_ALIGNED_MEMORY_SUPPORTED)) && defined(__arm__)
 #     define PNG_ARM_NEON_OPT 2
 #  else
 #     define PNG_ARM_NEON_OPT 0
--------------------------------------------------------------------------

Support has been added for ARM_NEON, but aarch64 gcc also defines ARM_NEON so add __arm__ to the condition to make it build for aarch64.

--- hotspot changes ------------------------------------------------------
# HG changeset patch
# User enevill
# Date 1429193191 -3600
#      Thu Apr 16 15:06:31 2015 +0100
# Node ID 70d4f640f9311882a0ac04b0c8903f627fd9f866
# Parent  de82c08da80610a07f8922a33a94e56527f2006a
Fix build for aarch64/zero

diff -r de82c08da806 -r 70d4f640f931 src/share/vm/interpreter/interpreterRuntime.cpp
--- a/src/share/vm/interpreter/interpreterRuntime.cpp	Thu Apr 16 11:36:19 2015 +0100
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Thu Apr 16 15:06:31 2015 +0100
@@ -401,6 +401,7 @@
   int                handler_bci;
   int                current_bci = bci(thread);
 
+#ifndef CC_INTERP
   if (thread->frames_to_pop_failed_realloc() > 0) {
     // Allocation of scalar replaced object used in this frame
     // failed. Unconditionally pop the frame.
@@ -412,6 +413,7 @@
     thread->set_do_not_unlock_if_synchronized(true);
     return Interpreter::remove_activation_entry();
   }
+#endif
 
   // Need to do this check first since when _do_not_unlock_if_synchronized
   // is set, we don't want to trigger any classloading which may make calls
--------------------------------------------------------------------------

remove_activation_entry is undefined in zero so conditionalise this section of code out. this section of code is only executed after deopt so cannot happen on zero.