The package rpms/java-1.8.0-openjdk.git has added or updated architecture specific content
in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/java-1.8.0-openjdk.git/commit/?id....
Change:
+%ifarch %{sa_arches}
Thanks.
Full change:
============
commit 9d0851364932ba9979372daa96b1cd05989cdf8a
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Wed Feb 6 06:21:21 2019 +0000
Add backport of JDK-8145096 (PR3693) to fix undefined behaviour issues on newer GCCs
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index cbca97f..772c501 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -971,7 +971,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 1%{?dist}
+Release: 2%{?dist}
# java-1.5.0-ibm from
jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1223,6 +1223,8 @@ Patch587: jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
#############################################
# JDK-8029661, PR3642, RH1477159: Support TLS v1.2 algorithm in SunPKCS11 provider
Patch585: jdk8029661-pr3642-rh1477159-add_tlsv1_2_support_to_pkcs11_provider.patch
+# JDK-8145096, PR3693: Undefined behaviour in HotSpot
+Patch588: jdk8145096-pr3693-undefined_behaviour.patch
#############################################
#
@@ -1652,6 +1654,7 @@ sh %{SOURCE12}
%patch585
%patch586
%patch587
+%patch588
# RPM-only fixes
%patch525
@@ -2301,7 +2304,10 @@ require "copy_jdk_configs.lua"
%endif
%changelog
-* Tue Feb 05 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.201.b09-0
+* Wed Feb 06 2019 Andrew John Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.201.b09-2
+- Add backport of JDK-8145096 (PR3693) to fix undefined behaviour issues on newer GCCs
+
+* Tue Feb 05 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.201.b09-1
- Update to aarch64-shenandoah-jdk8u201-b09.
* Tue Feb 05 2019 Nicolas De Amicis <deamicis(a)bluewin.ch> - 1:1.8.0.192.b12-1
diff --git a/jdk8145096-pr3693-undefined_behaviour.patch
b/jdk8145096-pr3693-undefined_behaviour.patch
new file mode 100644
index 0000000..51aed3c
--- /dev/null
+++ b/jdk8145096-pr3693-undefined_behaviour.patch
@@ -0,0 +1,280 @@
+# HG changeset patch
+# User aph
+# Date 1549014450 -3600
+# Fri Feb 01 10:47:30 2019 +0100
+# Node ID f43f77de876acfbf29c02803418d4d06d83e7dc3
+# Parent 28f68e5c6fb323c521a489cfc92e8a129379378f
+8145096: Undefined behaviour in HotSpot
+Summary: Fix some integer overflows
+Reviewed-by: jrose, kvn, kbarrett, adinn, iklam
+
+diff --git openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp
openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+--- openjdk.orig/hotspot/src/os/posix/vm/os_posix.cpp
++++ openjdk/hotspot/src/os/posix/vm/os_posix.cpp
+@@ -604,7 +604,11 @@
+ strncpy(buffer, "none", size);
+
+ const struct {
+- int i;
++ // NB: i is an unsigned int here because SA_RESETHAND is on some
++ // systems 0x80000000, which is implicitly unsigned. Assignining
++ // it to an int field would be an overflow in unsigned-to-signed
++ // conversion.
++ unsigned int i;
+ const char* s;
+ } flaginfo [] = {
+ { SA_NOCLDSTOP, "SA_NOCLDSTOP" },
+diff --git openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp
openjdk/hotspot/src/share/vm/opto/addnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/addnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/addnode.cpp
+@@ -344,8 +344,8 @@
+ const Type *AddINode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeInt *r0 = t0->is_int(); // Handy access
+ const TypeInt *r1 = t1->is_int();
+- int lo = r0->_lo + r1->_lo;
+- int hi = r0->_hi + r1->_hi;
++ int lo = java_add(r0->_lo, r1->_lo);
++ int hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+@@ -462,8 +462,8 @@
+ const Type *AddLNode::add_ring( const Type *t0, const Type *t1 ) const {
+ const TypeLong *r0 = t0->is_long(); // Handy access
+ const TypeLong *r1 = t1->is_long();
+- jlong lo = r0->_lo + r1->_lo;
+- jlong hi = r0->_hi + r1->_hi;
++ jlong lo = java_add(r0->_lo, r1->_lo);
++ jlong hi = java_add(r0->_hi, r1->_hi);
+ if( !(r0->is_con() && r1->is_con()) ) {
+ // Not both constants, compute approximate result
+ if( (r0->_lo & r1->_lo) < 0 && lo >= 0 ) {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp
openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/loopTransform.cpp
++++ openjdk/hotspot/src/share/vm/opto/loopTransform.cpp
+@@ -1310,8 +1310,8 @@
+ limit = new (C) Opaque2Node( C, limit );
+ register_new_node( limit, opaq_ctrl );
+ }
+- if (stride_con > 0 && ((limit_type->_lo - stride_con) <
limit_type->_lo) ||
+- stride_con < 0 && ((limit_type->_hi - stride_con) >
limit_type->_hi)) {
++ if (stride_con > 0 && (java_subtract(limit_type->_lo, stride_con)
< limit_type->_lo) ||
++ stride_con < 0 && (java_subtract(limit_type->_hi, stride_con)
> limit_type->_hi)) {
+ // No underflow.
+ new_limit = new (C) SubINode(limit, stride);
+ } else {
+diff --git openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp
openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/mulnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/mulnode.cpp
+@@ -244,13 +244,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- int32 A = lo0*lo1;
++ int32 A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeInt::INT; // Overflow?
+- int32 B = lo0*hi1;
++ int32 B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeInt::INT; // Overflow?
+- int32 C = hi0*lo1;
++ int32 C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeInt::INT; // Overflow?
+- int32 D = hi0*hi1;
++ int32 D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeInt::INT; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -340,13 +340,13 @@
+ double d = (double)hi1;
+
+ // Compute all endpoints & check for overflow
+- jlong A = lo0*lo1;
++ jlong A = java_multiply(lo0, lo1);
+ if( (double)A != a*c ) return TypeLong::LONG; // Overflow?
+- jlong B = lo0*hi1;
++ jlong B = java_multiply(lo0, hi1);
+ if( (double)B != a*d ) return TypeLong::LONG; // Overflow?
+- jlong C = hi0*lo1;
++ jlong C = java_multiply(hi0, lo1);
+ if( (double)C != b*c ) return TypeLong::LONG; // Overflow?
+- jlong D = hi0*hi1;
++ jlong D = java_multiply(hi0, hi1);
+ if( (double)D != b*d ) return TypeLong::LONG; // Overflow?
+
+ if( A < B ) { lo0 = A; hi0 = B; } // Sort range endpoints
+@@ -573,7 +573,8 @@
+ // Masking off high bits which are always zero is useless.
+ const TypeLong* t1 = phase->type( in(1) )->isa_long();
+ if (t1 != NULL && t1->_lo >= 0) {
+- jlong t1_support = ((jlong)1 << (1 + log2_long(t1->_hi))) - 1;
++ int bit_count = log2_long(t1->_hi) + 1;
++ jlong t1_support = jlong(max_julong >> (BitsPerJavaLong - bit_count));
+ if ((t1_support & con) == t1_support)
+ return usr;
+ }
+@@ -801,7 +802,7 @@
+
+ // Check for ((x & ((CONST64(1)<<(64-c0))-1)) << c0) which ANDs off
high bits
+ // before shifting them away.
+- const jlong bits_mask = ((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) -
CONST64(1);
++ const jlong bits_mask = jlong(max_julong >> con);
+ if( add1_op == Op_AndL &&
+ phase->type(add1->in(2)) == TypeLong::make( bits_mask ) )
+ return new (phase->C) LShiftLNode( add1->in(1), in(2) );
+@@ -1253,7 +1254,7 @@
+ if ( con == 0 ) return NULL; // let Identity() handle a 0 shift count
+ // note: mask computation below does not work for 0 shift
count
+ // We'll be wanting the right-shift amount as a mask of that many bits
+- const jlong mask = (((jlong)CONST64(1) << (jlong)(BitsPerJavaLong - con)) -1);
++ const jlong mask = jlong(max_julong >> con);
+
+ // Check for ((x << z) + Y) >>> z. Replace with x + con>>>z
+ // The idiom for rounding to a power of 2 is "(Q+(2^z-1)) >>> z".
+diff --git openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp
openjdk/hotspot/src/share/vm/opto/subnode.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/subnode.cpp
++++ openjdk/hotspot/src/share/vm/opto/subnode.cpp
+@@ -252,8 +252,8 @@
+ const Type *SubINode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeInt *r0 = t1->is_int(); // Handy access
+ const TypeInt *r1 = t2->is_int();
+- int32 lo = r0->_lo - r1->_hi;
+- int32 hi = r0->_hi - r1->_lo;
++ int32 lo = java_subtract(r0->_lo, r1->_hi);
++ int32 hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+@@ -361,8 +361,8 @@
+ const Type *SubLNode::sub( const Type *t1, const Type *t2 ) const {
+ const TypeLong *r0 = t1->is_long(); // Handy access
+ const TypeLong *r1 = t2->is_long();
+- jlong lo = r0->_lo - r1->_hi;
+- jlong hi = r0->_hi - r1->_lo;
++ jlong lo = java_subtract(r0->_lo, r1->_hi);
++ jlong hi = java_subtract(r0->_hi, r1->_lo);
+
+ // We next check for 32-bit overflow.
+ // If that happens, we just assume all integers are possible.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/type.cpp
openjdk/hotspot/src/share/vm/opto/type.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/type.cpp
++++ openjdk/hotspot/src/share/vm/opto/type.cpp
+@@ -1329,8 +1329,8 @@
+
+ // The new type narrows the old type, so look for a "death march".
+ // See comments on PhaseTransform::saturate.
+- juint nrange = _hi - _lo;
+- juint orange = ohi - olo;
++ juint nrange = (juint)_hi - _lo;
++ juint orange = (juint)ohi - olo;
+ if (nrange < max_juint - 1 && nrange > (orange >> 1) +
(SMALLINT*2)) {
+ // Use the new type only if the range shrinks a lot.
+ // We do not want the optimizer computing 2^31 point by point.
+@@ -1363,7 +1363,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInt::hash(void) const {
+- return _lo+_hi+_widen+(int)Type::Int;
++ return java_add(java_add(_lo, _hi), java_add(_widen, (int)Type::Int));
+ }
+
+ //------------------------------is_finite--------------------------------------
+@@ -1544,7 +1544,7 @@
+ // If neither endpoint is extremal yet, push out the endpoint
+ // which is closer to its respective limit.
+ if (_lo >= 0 || // easy common case
+- (julong)(_lo - min) >= (julong)(max - _hi)) {
++ ((julong)_lo - min) >= ((julong)max - _hi)) {
+ // Try to widen to an unsigned range type of 32/63 bits:
+ if (max >= max_juint && _hi < max_juint)
+ return make(_lo, max_juint, WidenMax);
+@@ -2314,7 +2314,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypePtr::hash(void) const {
+- return _ptr + _offset;
++ return java_add(_ptr, _offset);
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -2904,12 +2904,8 @@
+ // Type-specific hashing function.
+ int TypeOopPtr::hash(void) const {
+ return
+- (const_oop() ? const_oop()->hash() : 0) +
+- _klass_is_exact +
+- _instance_id +
+- hash_speculative() +
+- _inline_depth +
+- TypePtr::hash();
++ java_add(java_add(java_add(const_oop() ? const_oop()->hash() : 0,
_klass_is_exact),
++ java_add(_instance_id , hash_speculative())),
java_add(_inline_depth , TypePtr::hash()));
+ }
+
+ //------------------------------dump2------------------------------------------
+@@ -3635,7 +3631,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeInstPtr::hash(void) const {
+- int hash = klass()->hash() + TypeOopPtr::hash();
++ int hash = java_add(klass()->hash(), TypeOopPtr::hash());
+ return hash;
+ }
+
+@@ -4530,7 +4526,7 @@
+ //------------------------------hash-------------------------------------------
+ // Type-specific hashing function.
+ int TypeKlassPtr::hash(void) const {
+- return klass()->hash() + TypePtr::hash();
++ return java_add(klass()->hash(), TypePtr::hash());
+ }
+
+ //------------------------------singleton--------------------------------------
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
++++ openjdk/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+@@ -131,7 +131,8 @@
+ }
+
+ double AdvancedThresholdPolicy::weight(Method* method) {
+- return (method->rate() + 1) * ((method->invocation_count() + 1) *
(method->backedge_count() + 1));
++ return (double)(method->rate() + 1) *
++ (method->invocation_count() + 1) * (method->backedge_count() + 1);
+ }
+
+ // Apply heuristics and return true if x should be compiled before y
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1403,6 +1403,32 @@
+
+ #define ARRAY_SIZE(array) (sizeof(array)/sizeof((array)[0]))
+
++//----------------------------------------------------------------------------------------------------
++// Sum and product which can never overflow: they wrap, just like the
++// Java operations. Note that we don't intend these to be used for
++// general-purpose arithmetic: their purpose is to emulate Java
++// operations.
++
++// The goal of this code to avoid undefined or implementation-defined
++// behaviour. The use of an lvalue to reference cast is explicitly
++// permitted by Lvalues and rvalues [basic.lval]. [Section 3.10 Para
++// 15 in C++03]
++#define JAVA_INTEGER_OP(OP, NAME, TYPE, UNSIGNED_TYPE) \
++inline TYPE NAME (TYPE in1, TYPE in2) { \
++ UNSIGNED_TYPE ures = static_cast<UNSIGNED_TYPE>(in1); \
++ ures OP ## = static_cast<UNSIGNED_TYPE>(in2); \
++ return reinterpret_cast<TYPE&>(ures); \
++}
++
++JAVA_INTEGER_OP(+, java_add, jint, juint)
++JAVA_INTEGER_OP(-, java_subtract, jint, juint)
++JAVA_INTEGER_OP(*, java_multiply, jint, juint)
++JAVA_INTEGER_OP(+, java_add, jlong, julong)
++JAVA_INTEGER_OP(-, java_subtract, jlong, julong)
++JAVA_INTEGER_OP(*, java_multiply, jlong, julong)
++
++#undef JAVA_INTEGER_OP
++
+ // Dereference vptr
+ // All C++ compilers that we know of have the vtbl pointer in the first
+ // word. If there are exceptions, this function needs to be made compiler
commit acff3a06c51dc60b683a5c34de6bfab78e97fa29
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon Feb 4 00:15:04 2019 -0500
Update to aarch64-shenandoah-jdk8u201-b09.
diff --git a/.gitignore b/.gitignore
index 629c2fd..0644610 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b14.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u192-b12.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u201-b09.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 5930676..cbca97f 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -226,7 +226,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u192-b12
+%global shenandoah_revision aarch64-shenandoah-jdk8u201-b09
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -2301,6 +2301,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Tue Feb 05 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.201.b09-0
+- Update to aarch64-shenandoah-jdk8u201-b09.
+
* Tue Feb 05 2019 Nicolas De Amicis <deamicis(a)bluewin.ch> - 1:1.8.0.192.b12-1
- Added FX link of libglassgtk3.so
diff --git a/sources b/sources
index de3a0a2..f3790e8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) =
cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u192-b12.tar.xz) =
5fde4f3b2f8b903d650290f0745e8f4a8036d0dcec3642d66b0a5851eeaa6be40e2fd613916ecf27b7135b8038cab1d29968973678fd33d894fca7dd5ebb03f2
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u201-b09.tar.xz) =
dc132d100488aa4f8a98baeb7aeba13820e62c96062a6ef7f9b69269a1a928bf1dec05b8f0e6aa40177a1f3d60ae15bbb94e7be46293b9c555893d03747fbf82
commit 1f683e62865c50c8739226a1e06764eb35829745
Author: Nicolas De Amicis <deamicis(a)bluewin.ch>
Date: Tue Feb 5 15:04:24 2019 +0000
Update java-1.8.0-openjdk.spec
Added FX link of libglassgtk3.so
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index c9ceffa..5930676 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -211,7 +211,7 @@
# links src files
# maybe depend on jfx and generate the lists in build time? Yes, bad idea to inlcude
cyclic depndenci, but this list is aweful
%global jfx_jre_libs jfxswt.jar javafx.properties
-%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so
libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so
libglass.so libjavafx_iio.so libglassgtk2.so
+%global jfx_jre_native libprism_es2.so libprism_common.so libjavafx_font.so
libdecora_sse.so libjavafx_font_freetype.so libprism_sw.so libjavafx_font_pango.so
libglass.so libjavafx_iio.so libglassgtk2.so libglassgtk3.so
%global jfx_sdk_libs javafx-mx.jar packager.jar ant-javafx.jar
%global jfx_sdk_bins javafxpackager javapackager
%global jfx_jre_exts jfxrt.jar
@@ -971,7 +971,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 0%{?dist}
+Release: 1%{?dist}
# java-1.5.0-ibm from
jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -2301,6 +2301,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Tue Feb 05 2019 Nicolas De Amicis <deamicis(a)bluewin.ch> - 1:1.8.0.192.b12-1
+- Added FX link of libglassgtk3.so
+
* Wed Jan 30 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.192.b12-0
- Update to aarch64-shenandoah-jdk8u192-b12.
- Remove patches included upstream
commit a701d76ec7f0f02abbce6601943b4223b9692d1f
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Wed Jan 30 14:07:13 2019 +0000
Update to aarch64-shenandoah-jdk8u192-b12.
Remove patches included upstream
- JDK-8031668/PR2842
- JDK-8148351/PR2842
- JDK-6260348/PR3066
- JDK-8061305/PR3335/RH1423421
- JDK-8188030/PR3459/RH1484079
- JDK-8205104/PR3539/RH1548475
- JDK-8185723/PR3553
- JDK-8186461/PR3557
- JDK-8201509/PR3579
- JDK-8075942/PR3602
- JDK-8203182/PR3603
- JDK-8206406/PR3610/RH1597825
- JDK-8206425
- JDK-8036003
- JDK-8201495/PR2415
- JDK-8150954/PR2866/RH1176206
Re-generate patches (mostly due to upstream build changes)
- JDK-8073139/PR1758/RH1191652
- JDK-8143245/PR3548 (due to JDK-8202600)
- JDK-8197429/PR3546/RH1536622 (due to JDK-8189170)
- JDK-8199936/PR3533
- JDK-8199936/PR3591
- JDK-8207057/PR3613
- JDK-8210761/RH1632174 (due to JDK-8207402)
- PR3559 (due to JDK-8185723/JDK-8186461/JDK-8201509)
- PR3593 (due to JDK-8081202)
- RH1566890/CVE-2018-3639 (due to JDK-8189170)
- RH1649664 (due to JDK-8196516)
diff --git a/.gitignore b/.gitignore
index 95356b2..629c2fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,3 +129,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b12.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b14.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u192-b12.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 66f632c..c9ceffa 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -226,7 +226,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u191-b14
+%global shenandoah_revision aarch64-shenandoah-jdk8u192-b12
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -971,7 +971,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 1%{?dist}
+Release: 0%{?dist}
# java-1.5.0-ibm from
jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1120,6 +1120,10 @@ Patch103:
pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_
Patch105:
jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
# AArch64: PR3519: Fix further functions with a missing return value (AArch64)
Patch106: pr3519-fix_further_functions_with_a_missing_return_value.patch
+# AArch64: JDK-8160748: [AArch64] Inconsistent types for ideal_reg
+Patch107: jdk8160748-aarch64_ideal_reg.patch
+# AArch64: JDK-8189170: [AArch64] Add option to disable stack overflow checking in
primordial thread for use with JNI_CreateJavaJVM
+Patch108: jdk8189170-aarch64_primordial_thread.patch
#############################################
#
@@ -1181,47 +1185,6 @@ Patch625:
jdk8210425-rh1632174-03-compile_with_o2_and_ffp_contract_off_as_for_fd
#############################################
#
-# Patches appearing in 8u192
-#
-# This section includes patches which are present
-# in the listed OpenJDK 8u release and should be
-# able to be removed once that release is out
-# and used by this RPM.
-#############################################
-# S8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Patch506:
jdk8031668-pr2842-01-toolchain_find_compiler_unexpectedly_resolves_symbolic_links.patch
-# S8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Patch507:
jdk8148351-pr2842-02-only_display_resolved_symlink_for_compiler_do_not_change_path.patch
-# S6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Patch526:
jdk6260348-pr3066-gtk_laf_jtextcomponent_not_respecting_desktop_caret_blink_rate.patch
-# 8061305, PR3335, RH1423421: Javadoc crashes when method name ends with
"Property"
-Patch538:
jdk8061305-pr3335-rh1423421-javadoc_crashes_when_method_name_ends_with_property.patch
-# 8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are
present
-Patch560:
jdk8188030-pr3459-rh1484079-awt_java_apps_fail_to_start_when_some_minimal_fonts_are_present.patch
-# 8205104, PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-Patch562: jdk8205104-pr3539-rh1548475-pass_extra_ldflags_to_hotspot_build.patch
-# 8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Patch565: jdk8185723-pr3553-zero_segfaults_on_power_pc_32_bit.patch
-# 8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on
linux-powerpcspe
-Patch566:
jdk8186461-pr3557-zeros_atomic_copy64_should_use_spe_instructions_on_linux_powerpcspe.patch
-# 8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Patch569:
jdk8201509-pr3579-zero_S390_31bit_atomic_copy64_inline_assembler_is_wrong.patch
-# 8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Patch578:
jdk8075942-pr3602-rh1582032-arrayindexoutOfboundsException_in_sun_java2d_pisces_Dasher_goto.patch
-# 8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Patch579:
jdk8203182-pr3603-rh1568033_release_session_if_initialization_of_sunpkcs11_signature_fails.patch
-# 8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed
objects on StubCodeDesc::_list
-Patch580:
jdk8206406-pr3610-rh1597825-tubcodedesc_constructor_publishes_partially_constructed_objects_on_stubCodeDesc_list.patch
-# Patches 204 and 205 stop the build adding .gnu_debuglink sections to unstripped files
-# 8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Patch204:
jdk8206425-gnu_debuglink_sections_added_unconditionally_when_no_debuginfo_is_stripped.patch
-# 8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Patch205: jdk8036003-add_with_native_debug_symbols_configure_flag.patch
-# s390: JDK-8201495, PR2415: JVM -Xmx requirement is too high on s390
-Patch100: jdk8201495-zero_reduce_limits_of_max_heap_size_for_boot_JDK_on_s390.patch
-
-#############################################
-#
# Patches appearing in 8u202
#
# This section includes patches which are present
@@ -1229,8 +1192,6 @@ Patch100:
jdk8201495-zero_reduce_limits_of_max_heap_size_for_boot_JDK_on_s390.pa
# able to be removed once that release is out
# and used by this RPM.
#############################################
-# S8150954, RH1176206, PR2866: Taking screenshots on x11 composite desktop produces wrong
result
-Patch508: jdk8150954-pr2866-rh1176206-screenshot_xcomposite_jdk.patch
# 8207057, PR3613: Enable debug information for assembly code files
Patch206: jdk8207057-pr3613-no_debug_info_for_assembler_files_hotspot.patch
Patch207: jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
@@ -1625,8 +1586,6 @@ sh %{SOURCE12}
%patch203
# Debugging fixes
-%patch204
-%patch205
%patch206
%patch207
%patch210
@@ -1639,12 +1598,13 @@ sh %{SOURCE12}
%patch7
# s390 build fixes
-%patch100
%patch102
%patch103
# AArch64 fixes
%patch106
+%patch107
+%patch108
# x86 fixes
%patch105
@@ -1657,9 +1617,6 @@ sh %{SOURCE12}
# Upstreamable fixes
%patch502
%patch504
-%patch506
-%patch507
-%patch508
%patch512
%patch513
%patch514
@@ -1670,20 +1627,13 @@ sh %{SOURCE12}
%patch519
%patch400
%patch523
-%patch526
%patch528
%patch529
%patch530
-%patch538
-%patch560
%patch561
-%patch562
%patch563
%patch564
-%patch565
-%patch566
%patch567
-%patch569
%patch571
%patch572
%patch573
@@ -1691,9 +1641,6 @@ sh %{SOURCE12}
%patch575
%patch576
%patch577
-%patch578
-%patch579
-%patch580
%patch620
%patch621
%patch622
@@ -2354,7 +2301,41 @@ require "copy_jdk_configs.lua"
%endif
%changelog
-* Mon Jan 14 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-1
+* Wed Jan 30 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.192.b12-0
+- Update to aarch64-shenandoah-jdk8u192-b12.
+- Remove patches included upstream
+ - JDK-8031668/PR2842
+ - JDK-8148351/PR2842
+ - JDK-6260348/PR3066
+ - JDK-8061305/PR3335/RH1423421
+ - JDK-8188030/PR3459/RH1484079
+ - JDK-8205104/PR3539/RH1548475
+ - JDK-8185723/PR3553
+ - JDK-8186461/PR3557
+ - JDK-8201509/PR3579
+ - JDK-8075942/PR3602
+ - JDK-8203182/PR3603
+ - JDK-8206406/PR3610/RH1597825
+ - JDK-8206425
+ - JDK-8036003
+ - JDK-8201495/PR2415
+ - JDK-8150954/PR2866/RH1176206
+- Re-generate patches (mostly due to upstream build changes)
+ - JDK-8073139/PR1758/RH1191652
+ - JDK-8143245/PR3548 (due to JDK-8202600)
+ - JDK-8197429/PR3546/RH1536622 (due to JDK-8189170)
+ - JDK-8199936/PR3533
+ - JDK-8199936/PR3591
+ - JDK-8207057/PR3613
+ - JDK-8210761/RH1632174 (due to JDK-8207402)
+ - PR3559 (due to JDK-8185723/JDK-8186461/JDK-8201509)
+ - PR3593 (due to JDK-8081202)
+ - RH1566890/CVE-2018-3639 (due to JDK-8189170)
+ - RH1649664 (due to JDK-8196516)
+- Add 8160748 for AArch64 which is missing from upstream 8u version.
+- Add port of 8189170 to AArch64 which is missing from upstream 8u version.
+
+* Mon Jan 28 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-1
- Add 8131048 & 8164920 (PR3574/RH1498936) to provide a CRC32 intrinsic for PPC64.
* Thu Jan 24 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-0
diff --git
a/jdk6260348-pr3066-gtk_laf_jtextcomponent_not_respecting_desktop_caret_blink_rate.patch
b/jdk6260348-pr3066-gtk_laf_jtextcomponent_not_respecting_desktop_caret_blink_rate.patch
deleted file mode 100644
index 06be502..0000000
---
a/jdk6260348-pr3066-gtk_laf_jtextcomponent_not_respecting_desktop_caret_blink_rate.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-# HG changeset patch
-# User ssadetsky
-# Date 1467220169 -3600
-# Wed Jun 29 18:09:29 2016 +0100
-# Node ID 9fffaa63c49d93bff70b96af9a86b7635bce44be
-# Parent d0462c26152fc8bd5f79db7f1670777e807ef2b3
-6260348, PR3066: GTK+ L&F JTextComponent not respecting desktop caret blink rate
-Reviewed-by: alexsch, azvegint
-
-diff -r d0462c26152f -r 9fffaa63c49d
src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Tue Jun 28
19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java Wed Jun 29
18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -93,7 +93,9 @@
- */
- static enum Settings {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- }
-
- /* Custom regions are needed for representing regions that don't exist
-diff -r d0462c26152f -r 9fffaa63c49d
src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
---- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Tue Jun
28 19:44:50 2016 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jun
29 18:09:29 2016 +0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -371,7 +371,17 @@
- int vProgWidth = 22 - (progXThickness * 2);
- int vProgHeight = 80 - (progYThickness * 2);
-
-- Integer caretBlinkRate = Integer.valueOf(500);
-+ Integer caretBlinkRate;
-+ if (Boolean.FALSE.equals(GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK))) {
-+ caretBlinkRate = Integer.valueOf(0);
-+ } else {
-+ caretBlinkRate = (Integer) GTKEngine.INSTANCE.getSetting(
-+ GTKEngine.Settings.GTK_CURSOR_BLINK_TIME);
-+ if (caretBlinkRate == null) {
-+ caretBlinkRate = Integer.valueOf(500);
-+ }
-+ }
- Insets zeroInsets = new InsetsUIResource(0, 0, 0, 0);
-
- Double defaultCaretAspectRatio = new Double(0.025);
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.c
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Tue Jun 28 19:44:50 2016
+0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.c Wed Jun 29 18:09:29 2016
+0100
-@@ -1316,9 +1316,6 @@
- {
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_COMBO_BOX_TEXT_FIELD_TYPE];
- break;
-@@ -1363,10 +1360,6 @@
- {
- gtk2_widgets[_GTK_ENTRY_TYPE] =
- (*fp_gtk_entry_new)();
--
-- GtkSettings* settings =
-- fp_gtk_widget_get_settings(gtk2_widgets[_GTK_ENTRY_TYPE]);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_ENTRY_TYPE];
- break;
-@@ -1558,9 +1551,6 @@
- {
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE] =
- (*fp_gtk_spin_button_new)(NULL, 0, 0);
--
-- GtkSettings* settings = fp_gtk_widget_get_settings(result);
-- fp_g_object_set(settings, "gtk-cursor-blink", FALSE, NULL);
- }
- result = gtk2_widgets[_GTK_SPIN_BUTTON_TYPE];
- break;
-@@ -2510,14 +2500,20 @@
-
- return result;
- }
--/*
-+
- jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
- {
-- gint intval = NULL;
--
-+ gint intval = NULL;
- (*fp_g_object_get)(settings, key, &intval, NULL);
- return create_Integer(env, intval);
--}*/
-+}
-+
-+jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key)
-+{
-+ gint intval = NULL;
-+ (*fp_g_object_get)(settings, key, &intval, NULL);
-+ return create_Boolean(env, intval);
-+}
-
- jobject gtk2_get_setting(JNIEnv *env, Setting property)
- {
-@@ -2529,6 +2525,10 @@
- return get_string_property(env, settings, "gtk-font-name");
- case GTK_ICON_SIZES:
- return get_string_property(env, settings, "gtk-icon-sizes");
-+ case GTK_CURSOR_BLINK:
-+ return get_boolean_property(env, settings, "gtk-cursor-blink");
-+ case GTK_CURSOR_BLINK_TIME:
-+ return get_integer_property(env, settings,
"gtk-cursor-blink-time");
- }
-
- return NULL;
-diff -r d0462c26152f -r 9fffaa63c49d src/solaris/native/sun/awt/gtk2_interface.h
---- openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Tue Jun 28 19:44:50 2016
+0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/gtk2_interface.h Wed Jun 29 18:09:29 2016
+0100
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -140,7 +140,9 @@
- typedef enum _Setting
- {
- GTK_FONT_NAME,
-- GTK_ICON_SIZES
-+ GTK_ICON_SIZES,
-+ GTK_CURSOR_BLINK,
-+ GTK_CURSOR_BLINK_TIME
- } Setting;
-
- /* GTK types, here to eliminate need for GTK headers at compile time */
diff --git
a/jdk8031668-pr2842-01-toolchain_find_compiler_unexpectedly_resolves_symbolic_links.patch
b/jdk8031668-pr2842-01-toolchain_find_compiler_unexpectedly_resolves_symbolic_links.patch
deleted file mode 100644
index faaa309..0000000
---
a/jdk8031668-pr2842-01-toolchain_find_compiler_unexpectedly_resolves_symbolic_links.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User mduigou
-# Date 1389723922 28800
-# Tue Jan 14 10:25:22 2014 -0800
-# Node ID 842cc183c9f6d29270ff002238248978c08f0a66
-# Parent f0635543beb309c4da1bb88c906a76ee4b75e16d
-8031668, PR2842: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
-Reviewed-by: erikj, ihse
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -230,8 +230,8 @@
- $1="$PROPER_COMPILER_$1"
- else
- AC_MSG_RESULT([no, keeping $1])
-- $1="$TEST_COMPILER"
- fi
-+
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
- ])
-
diff --git a/jdk8036003-add_with_native_debug_symbols_configure_flag.patch
b/jdk8036003-add_with_native_debug_symbols_configure_flag.patch
deleted file mode 100644
index b7b8a05..0000000
--- a/jdk8036003-add_with_native_debug_symbols_configure_flag.patch
+++ /dev/null
@@ -1,249 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1531824954 -7200
-# Node ID 19e8754f5415cdda79904b9f21a4b8981505cb78
-# Parent 1380ce862bbd0b65c619bfcea454d612b240e332
-8036003: Add --with-native-debug-symbols=[none|internal|external|zipped]
-Reviewed-by: erikj
-
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4 Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/jdk-options.m4 Tue Jul 17 12:55:54 2018 +0200
-@@ -1,5 +1,5 @@
- #
--# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
-+# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
- # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- #
- # This code is free software; you can redistribute it and/or modify it
-@@ -606,11 +606,88 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
-
- if test "x${enable_zip_debug_info}" = "xno"; then
- ZIP_DEBUGINFO_FILES=false
-+ elif test "x${enable_zip_debug_info}" = "xyes"; then
-+ ZIP_DEBUGINFO_FILES=true
-+ fi
-+
-+ #
-+ # NATIVE_DEBUG_SYMBOLS
-+ # This must be done after the toolchain is setup, since we're looking at objcopy.
-+ # In addition, this must be done after ENABLE_DEBUG_SYMBOLS and ZIP_DEBUGINFO_FILES
-+ # checking in order to preserve backwards compatibility post JDK-8207234.
-+ #
-+ AC_MSG_CHECKING([what type of native debug symbols to use (this will override previous
settings)])
-+ AC_ARG_WITH([native-debug-symbols],
-+ [AS_HELP_STRING([--with-native-debug-symbols],
-+ [set the native debug symbol configuration (none, internal, external, zipped)
@<:@varying@:>@])],
-+ [
-+ if test "x$OPENJDK_TARGET_OS" = xaix; then
-+ if test "x$with_native_debug_symbols" = xexternal || test
"x$with_native_debug_symbols" = xzipped; then
-+ AC_MSG_ERROR([AIX only supports the parameters 'none' and
'internal' for --with-native-debug-symbols])
-+ fi
-+ fi
-+ ],
-+ [
-+ # Default to unset for backwards compatibility
-+ with_native_debug_symbols=""
-+ ])
-+ NATIVE_DEBUG_SYMBOLS=$with_native_debug_symbols
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = x; then
-+ AC_MSG_RESULT([not specified])
- else
-+ AC_MSG_RESULT([$NATIVE_DEBUG_SYMBOLS])
-+ fi
-+ # Default is empty
-+ DEBUG_BINARIES=
-+ # Default is min_strip. Possible values are min_strip, all_strip, no_strip
-+ STRIP_POLICY=min_strip
-+
-+ if test "x$NATIVE_DEBUG_SYMBOLS" = xzipped; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test
"x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
- ZIP_DEBUGINFO_FILES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
-+ ENABLE_DEBUG_SYMBOLS=false
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=no_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ POST_STRIP_CMD=
-+ DEBUG_BINARIES=true
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" = xexternal; then
-+
-+ if test "x$OPENJDK_TARGET_OS" = xsolaris || test
"x$OPENJDK_TARGET_OS" = xlinux; then
-+ if test "x$OBJCOPY" = x; then
-+ # enabling of enable-debug-symbols and can't find objcopy
-+ # this is an error
-+ AC_MSG_ERROR([Unable to find objcopy, cannot enable native debug symbols])
-+ fi
-+ fi
-+
-+ ENABLE_DEBUG_SYMBOLS=true
-+ STRIP_POLICY=min_strip
-+ ZIP_DEBUGINFO_FILES=false
-+ elif test "x$NATIVE_DEBUG_SYMBOLS" != x; then
-+ AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])
-+ else
-+ AC_MSG_NOTICE([--with-native-debug-symbols not specified. Using values from
--disable-debug-symbols and --disable-zip-debug-info])
- fi
-
- AC_SUBST(ENABLE_DEBUG_SYMBOLS)
-+ AC_SUBST(STRIP_POLICY)
-+ AC_SUBST(POST_STRIP_CMD)
-+ AC_SUBST(DEBUG_BINARIES)
- AC_SUBST(ZIP_DEBUGINFO_FILES)
- AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
- AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
-diff -r 1380ce862bbd -r 19e8754f5415 common/autoconf/spec.gmk.in
---- openjdk/common/autoconf/spec.gmk.in Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/common/autoconf/spec.gmk.in Tue Jul 17 12:55:54 2018 +0200
-@@ -416,6 +416,8 @@
- CFLAGS_DEBUG_SYMBOLS:=@CFLAGS_DEBUG_SYMBOLS@
- CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
- ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
-+STRIP_POLICY:=@STRIP_POLICY@
-+DEBUG_BINARIES:=@DEBUG_BINARIES@
-
- #
- # Compress (or not) jars
-diff -r 1380ce862bbd -r 19e8754f5415 make/common/NativeCompilation.gmk
---- openjdk/make/common/NativeCompilation.gmk Mon Jul 16 15:37:08 2018 +0100
-+++ openjdk/make/common/NativeCompilation.gmk Tue Jul 17 12:55:54 2018 +0200
-@@ -260,6 +260,10 @@
- $1_CC:=$(CC)
- endif
-
-+ ifeq ($$($1_STRIP_POLICY),)
-+ $1_STRIP_POLICY:=$$(STRIP_POLICY)
-+ endif
-+
- # Make sure the dirs exist.
- $$(eval $$(call MakeDir,$$($1_OBJECT_DIR) $$($1_OUTPUT_DIR)))
- $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),,$$(error SRC specified to
SetupNativeCompilation $1 contains missing directory $$d)))
-@@ -455,28 +459,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC
flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set)
from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo :
$$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the
SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set)
from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo :
$$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo :
$$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo :
$$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif # Touch to not retrigger rule on rebuild
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -500,7 +510,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \
- $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo
files
-- $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo
-+ endif
- endif
- endif
- endif
-@@ -539,28 +551,34 @@
- ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X
- ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows
- ifeq ($(OPENJDK_TARGET_OS), solaris)
-- # gobjcopy crashes on "empty" section headers with the SHF_ALLOC
flag set.
-- # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set)
from
-- # empty section headers until a fixed $(OBJCOPY) is available.
-- # An empty section header has sh_addr == 0 and sh_size == 0.
-- # This problem has only been seen on Solaris X64, but we call this tool
-- # on all Solaris builds just in case.
-- #
-- # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-- # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ # gobjcopy crashes on "empty" section headers with the
SHF_ALLOC flag set.
-+ # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set)
from
-+ # empty section headers until a fixed $(OBJCOPY) is available.
-+ # An empty section header has sh_addr == 0 and sh_size == 0.
-+ # This problem has only been seen on Solaris X64, but we call this tool
-+ # on all Solaris builds just in case.
-+ #
-+ # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections.
-+ # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available.
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK)
- $(RM) $$@
- $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$<
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$<
-+ endif
- else # not solaris
-- $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET)
- $(RM) $$@
- $(OBJCOPY) --only-keep-debug $$< $$@
- $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$<
-+ endif
- endif
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
- $(TOUCH) $$@
-+ endif
- endif # !windows
- endif # !macosx
-
-@@ -584,7 +602,9 @@
- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \
- $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb
- else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo
files
-- $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ ifneq ($$($1_STRIP_POLICY), no_strip)
-+ $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo
-+ endif
- endif
- endif
- endif
-
diff --git
a/jdk8061305-pr3335-rh1423421-javadoc_crashes_when_method_name_ends_with_property.patch
b/jdk8061305-pr3335-rh1423421-javadoc_crashes_when_method_name_ends_with_property.patch
deleted file mode 100644
index 384c52a..0000000
---
a/jdk8061305-pr3335-rh1423421-javadoc_crashes_when_method_name_ends_with_property.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# HG changeset patch
-# User ksrini
-# Date 1414764176 25200
-# Fri Oct 31 07:02:56 2014 -0700
-# Node ID 9fd9a50e7994a9659c5ef21296d0baee4c2eecff
-# Parent fd59a2d4313440077fce3fbf39174755a15d285a
-8061305: Javadoc crashes when method name ends with "Property"
-Reviewed-by: jjg
-
-diff --git
jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
----
jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-+++
jdk8/langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
-@@ -656,6 +656,9 @@
- // properties aren't named setA* or getA*
- private final Pattern pattern =
Pattern.compile("[sg]et\\p{Upper}.*");
- private boolean isPropertyMethod(MethodDoc method) {
-+ if (!configuration.javafx) {
-+ return false;
-+ }
- if (!method.name().endsWith("Property")) {
- return false;
- }
-@@ -667,7 +670,9 @@
- if (pattern.matcher(method.name()).matches()) {
- return false;
- }
--
-+ if (method.typeParameters().length > 0) {
-+ return false;
-+ }
- return 0 == method.parameters().length
- &&
!"void".equals(method.returnType().simpleTypeName());
- }
diff --git
a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
index 6511281..67fc620 100644
--- a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
@@ -8,6 +8,19 @@
Reviewed-by: erikj, goetz, dholmes
Contributed-by: Andrew Hughes <gnu.andrew(a)redhat.com>, Alexander Smundak
<asmundak(a)google.com>
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -549,6 +549,9 @@
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -D_BIG_ENDIAN"
+ fi
+ fi
++ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
++ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DABI_ELFv2"
++ fi
+
+ # Setup target OS define. Use OS target name but in upper case.
+ OPENJDK_TARGET_OS_UPPERCASE=`$ECHO $OPENJDK_TARGET_OS | $TR
'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
diff --git openjdk.orig///common/autoconf/jdk-options.m4
openjdk///common/autoconf/jdk-options.m4
--- openjdk.orig///common/autoconf/jdk-options.m4
+++ openjdk///common/autoconf/jdk-options.m4
@@ -32,16 +45,3 @@ diff --git openjdk.orig///common/autoconf/platform.m4
openjdk///common/autoconf/
VAR_CPU_ARCH=ppc
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=little
-diff --git openjdk.orig///common/autoconf/toolchain.m4
openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -1123,6 +1123,9 @@
- else
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
- fi
-+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
-+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DABI_ELFv2"
-+ fi
- if test "x$OPENJDK_TARGET_OS" = xlinux; then
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
- fi
diff --git
a/jdk8075942-pr3602-rh1582032-arrayindexoutOfboundsException_in_sun_java2d_pisces_Dasher_goto.patch
b/jdk8075942-pr3602-rh1582032-arrayindexoutOfboundsException_in_sun_java2d_pisces_Dasher_goto.patch
deleted file mode 100644
index bd2a40e..0000000
---
a/jdk8075942-pr3602-rh1582032-arrayindexoutOfboundsException_in_sun_java2d_pisces_Dasher_goto.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-# HG changeset patch
-# User prr
-# Date 1429299166 25200
-# Fri Apr 17 12:32:46 2015 -0700
-# Node ID 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-# Parent 533117ae5b7587c8d9c0612581682ab984475430
-8075942, PR3602: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
-Reviewed-by: flar, lbourges
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
---- openjdk.orig/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-+++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Dasher.java
-@@ -146,7 +146,7 @@
- if (dashOn) {
- if (starting) {
- firstSegmentsBuffer = Helpers.widenArray(firstSegmentsBuffer,
-- firstSegidx, type - 2);
-+ firstSegidx, type - 2 + 1);
- firstSegmentsBuffer[firstSegidx++] = type;
- System.arraycopy(pts, off, firstSegmentsBuffer, firstSegidx, type - 2);
- firstSegidx += type - 2;
-diff --git a/test/javopenjdk.orig/jdk/awt/BasicStroke/DashStrokeTest.java
openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-new file mode 100644
---- /dev/null
-+++ openjdk/jdk/test/java/awt/BasicStroke/DashStrokeTest.java
-@@ -0,0 +1,69 @@
-+/*
-+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit
www.oracle.com if you need additional information or have any
-+ * questions.
-+ *
-+ * @test
-+ * @bug 8075942
-+ * @summary test there is no exception rendering a dashed stroke
-+ * @run DashStrokeTest
-+ * @run -Dsun.java2d.renderer=sun.java2d.pisces.PiscesRenderingEngine
-+ */
-+
-+import java.awt.BasicStroke;
-+import java.awt.Color;
-+import java.awt.Graphics2D;
-+import java.awt.Stroke;
-+import java.awt.geom.GeneralPath;
-+import java.awt.image.BufferedImage;
-+
-+
-+public class DashStrokeTest {
-+
-+ public static void main(String[] args) {
-+
-+ GeneralPath shape = new GeneralPath();
-+ int[] pointTypes = {0, 0, 1, 1, 0, 1, 1, 0};
-+ double[] xpoints = {428, 420, 400, 400, 400, 400, 420, 733};
-+ double[] ypoints = {180, 180, 180, 160, 30, 10, 10, 10};
-+ shape.moveTo(xpoints[0], ypoints[0]);
-+ for (int i = 1; i < pointTypes.length; i++) {
-+ if (pointTypes[i] == 1 && i < pointTypes.length - 1) {
-+ shape.quadTo(xpoints[i], ypoints[i],
-+ xpoints[i + 1], ypoints[i + 1]);
-+ } else {
-+ shape.lineTo(xpoints[i], ypoints[i]);
-+ }
-+ }
-+
-+ BufferedImage image = new
-+ BufferedImage(1000, 1000, BufferedImage.TYPE_INT_ARGB);
-+ Graphics2D g2 = image.createGraphics();
-+
-+ Color color = new Color(124, 0, 124, 255);
-+ g2.setColor(color);
-+ Stroke stroke = new BasicStroke(1.0f,
-+ BasicStroke.CAP_BUTT,
-+ BasicStroke.JOIN_BEVEL,
-+ 10.0f, new float[] {9, 6}, 0.0f);
-+ g2.setStroke(stroke);
-+ g2.draw(shape);
-+ }
-+}
diff --git a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
index eccb110..b0a88ea 100644
--- a/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
+++ b/jdk8143245-pr3548-zero_build_requires_disabled_warnings.patch
@@ -60,12 +60,12 @@ diff --git openjdk.orig/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp
openjdk/h
switch (type) {
case T_VOID:
ftype = &ffi_type_void;
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
+ * Copyright 2016 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -126,14 +126,6 @@ diff --git
openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openj
}
void os::Linux::set_fpu_control_word(int fpu) {
-@@ -408,6 +418,7 @@
-
- extern "C" {
- int SpinPause() {
-+ return -1; // silence compile warnings
- }
-
-
diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp
diff --git
a/jdk8148351-pr2842-02-only_display_resolved_symlink_for_compiler_do_not_change_path.patch
b/jdk8148351-pr2842-02-only_display_resolved_symlink_for_compiler_do_not_change_path.patch
deleted file mode 100644
index 1812e19..0000000
---
a/jdk8148351-pr2842-02-only_display_resolved_symlink_for_compiler_do_not_change_path.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User ihse
-# Date 1454642639 0
-# Fri Feb 05 03:23:59 2016 +0000
-# Node ID 61798573efe5a9efa67e268a52cf61263abb4396
-# Parent 842cc183c9f6d29270ff002238248978c08f0a66
-8148351, PR2842: Only display resolved symlink for compiler, do not change path
-Reviewed-by: erikj
-
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -198,38 +198,22 @@
- fi
- BASIC_FIXUP_EXECUTABLE($1)
- TEST_COMPILER="[$]$1"
-- # Don't remove symbolic links on AIX because 'xlc_r' and 'xlC_r'
may all be links
-- # to 'xlc' but it is crucial that we invoke the compiler with the right name!
-- if test "x$OPENJDK_BUILD_OS" != xaix; then
-- AC_MSG_CHECKING([resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(TEST_COMPILER)
-- AC_MSG_RESULT([$TEST_COMPILER])
-- fi
-- AC_MSG_CHECKING([if $1 is disguised ccache])
-
-- COMPILER_BASENAME=`$BASENAME "$TEST_COMPILER"`
-- if test "x$COMPILER_BASENAME" = "xccache"; then
-- AC_MSG_RESULT([yes, trying to find proper $COMPILER_NAME compiler])
-- # We /usr/lib/ccache in the path, so cc is a symlink to /usr/bin/ccache.
-- # We want to control ccache invocation ourselves, so ignore this cc and try
-- # searching again.
-+ AC_MSG_CHECKING([resolved symbolic links for $1])
-+ SYMLINK_ORIGINAL="$TEST_COMPILER"
-+ BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL)
-+ if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then
-+ AC_MSG_RESULT([no symlink])
-+ else
-+ AC_MSG_RESULT([$SYMLINK_ORIGINAL])
-
-- # Remove the path to the fake ccache cc from the PATH
-- RETRY_COMPILER_SAVED_PATH="$PATH"
-- COMPILER_DIRNAME=`$DIRNAME [$]$1`
-- PATH="`$ECHO $PATH | $SED -e "s,$COMPILER_DIRNAME,,g" -e
"s,::,:,g" -e "s,^:,,g"`"
--
-- # Try again looking for our compiler
-- AC_CHECK_TOOLS(PROPER_COMPILER_$1, $3)
-- BASIC_FIXUP_EXECUTABLE(PROPER_COMPILER_$1)
-- PATH="$RETRY_COMPILER_SAVED_PATH"
--
-- AC_MSG_CHECKING([for resolved symbolic links for $1])
-- BASIC_REMOVE_SYMBOLIC_LINKS(PROPER_COMPILER_$1)
-- AC_MSG_RESULT([$PROPER_COMPILER_$1])
-- $1="$PROPER_COMPILER_$1"
-- else
-- AC_MSG_RESULT([no, keeping $1])
-+ # We can't handle ccache by gcc wrappers, since we need to know if we're
-+ # using ccache. Instead ccache usage must be controlled by a configure option.
-+ COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"`
-+ if test "x$COMPILER_BASENAME" = "xccache"; then
-+ AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped
compiler.])
-+ AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not
supported.])
-+ fi
- fi
-
- TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME])
diff --git a/jdk8150954-pr2866-rh1176206-screenshot_xcomposite_jdk.patch
b/jdk8150954-pr2866-rh1176206-screenshot_xcomposite_jdk.patch
deleted file mode 100644
index 8b62ae6..0000000
--- a/jdk8150954-pr2866-rh1176206-screenshot_xcomposite_jdk.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-
-# HG changeset patch
-# User neugens
-# Date 1532089120 -7200
-# Node ID 7b30bb9b05bd2e8045bc693ea5be353ce6326396
-# Parent 3d8011a1e02179e5658110981e30274c605ceac8
-8150954: Taking screenshots on x11 composite desktop produce wrong result
-Summary: The AWT Robot X11 code that takes screenshots uses the default root window,
which may not contain the final composited desktop.
-Reviewed-by: alexsch, ssadetsky, prr, dbuck
-
-diff -r 3d8011a1e021 -r 7b30bb9b05bd make/mapfiles/libawt_xawt/mapfile-vers
---- openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/make/mapfiles/libawt_xawt/mapfile-vers Fri Jul 20 14:18:40 2018 +0200
-@@ -158,6 +158,7 @@
- Java_sun_awt_X11_XRobotPeer_mouseReleaseImpl;
- Java_sun_awt_X11_XRobotPeer_mouseWheelImpl;
- Java_sun_awt_X11_XRobotPeer_setup;
-+ Java_sun_awt_X11_XRobotPeer_loadNativeLibraries;
- Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl;
- Java_java_awt_Component_initIDs;
- Java_java_awt_Container_initIDs;
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/classes/sun/awt/X11/XRobotPeer.java
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Thu Jul 19 03:31:37 2018
+0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XRobotPeer.java Fri Jul 20 14:18:40 2018
+0200
-@@ -34,6 +34,10 @@
-
- class XRobotPeer implements RobotPeer {
-
-+ static {
-+ loadNativeLibraries();
-+ }
-+
- private X11GraphicsConfig xgc = null;
- /*
- * native implementation uses some static shared data (pipes, processes)
-@@ -98,4 +102,5 @@
- private static native synchronized void keyReleaseImpl(int keycode);
-
- private static native synchronized void getRGBPixelsImpl(X11GraphicsConfig xgc, int
x, int y, int width, int height, int pixelArray[]);
-+ private static native void loadNativeLibraries();
- }
-diff -r 3d8011a1e021 -r 7b30bb9b05bd src/solaris/native/sun/awt/awt_Robot.c
---- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Thu Jul 19 03:31:37 2018 +0100
-+++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c Fri Jul 20 14:18:40 2018 +0200
-@@ -27,6 +27,9 @@
- #error This file should not be included in headless library
- #endif
-
-+#include "jvm_md.h"
-+#include <dlfcn.h>
-+
- #include "awt_p.h"
- #include "awt_GraphicsEnv.h"
- #define XK_MISCELLANY
-@@ -49,11 +52,46 @@
- #include <sys/socket.h>
- #endif
-
-+static Bool (*compositeQueryExtension) (Display*, int*, int*);
-+static Status (*compositeQueryVersion) (Display*, int*, int*);
-+static Window (*compositeGetOverlayWindow) (Display *, Window);
-+
- extern struct X11GraphicsConfigIDs x11GraphicsConfigIDs;
-
- static jint * masks;
- static jint num_buttons;
-
-+static void *xCompositeHandle;
-+
-+static const char* XCOMPOSITE = JNI_LIB_NAME("Xcomposite");
-+static const char* XCOMPOSITE_VERSIONED = VERSIONED_JNI_LIB_NAME("Xcomposite",
"1");
-+
-+static Bool checkXCompositeFunctions(void) {
-+ return (compositeQueryExtension != NULL &&
-+ compositeQueryVersion != NULL &&
-+ compositeGetOverlayWindow != NULL);
-+}
-+
-+static void initXCompositeFunctions(void) {
-+
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE, RTLD_LAZY | RTLD_GLOBAL);
-+ if (xCompositeHandle == NULL) {
-+ xCompositeHandle = dlopen(XCOMPOSITE_VERSIONED, RTLD_LAZY | RTLD_GLOBAL);
-+ }
-+ }
-+ //*(void **)(&asyncGetCallTraceFunction)
-+ if (xCompositeHandle != NULL) {
-+ *(void **)(&compositeQueryExtension) = dlsym(xCompositeHandle,
"XCompositeQueryExtension");
-+ *(void **)(&compositeQueryVersion) = dlsym(xCompositeHandle,
"XCompositeQueryVersion");
-+ *(void **)(&compositeGetOverlayWindow) = dlsym(xCompositeHandle,
"XCompositeGetOverlayWindow");
-+ }
-+
-+ if (xCompositeHandle && !checkXCompositeFunctions()) {
-+ dlclose(xCompositeHandle);
-+ }
-+}
-+
- static int32_t isXTestAvailable() {
- int32_t major_opcode, first_event, first_error;
- int32_t event_basep, error_basep, majorp, minorp;
-@@ -88,6 +126,35 @@
- return isXTestAvailable;
- }
-
-+static Bool hasXCompositeOverlayExtension(Display *display) {
-+
-+ int xoverlay = False;
-+ int eventBase, errorBase;
-+ if (checkXCompositeFunctions() &&
-+ compositeQueryExtension(display, &eventBase, &errorBase))
-+ {
-+ int major = 0;
-+ int minor = 0;
-+
-+ compositeQueryVersion(display, &major, &minor);
-+ if (major > 0 || minor >= 3) {
-+ xoverlay = True;
-+ }
-+ }
-+
-+ return xoverlay;
-+}
-+
-+static jboolean isXCompositeDisplay(Display *display, int screenNumber) {
-+
-+ char NET_WM_CM_Sn[25];
-+ snprintf(NET_WM_CM_Sn, sizeof(NET_WM_CM_Sn), "_NET_WM_CM_S%d\0",
screenNumber);
-+
-+ Atom managerSelection = XInternAtom(display, NET_WM_CM_Sn, 0);
-+ Window owner = XGetSelectionOwner(display, managerSelection);
-+
-+ return owner != 0;
-+}
-
- static XImage *getWindowImage(Display * display, Window window,
- int32_t x, int32_t y,
-@@ -232,6 +299,12 @@
- DASSERT(adata != NULL);
-
- rootWindow = XRootWindow(awt_display, adata->awt_visInfo.screen);
-+ if (hasXCompositeOverlayExtension(awt_display) &&
-+ isXCompositeDisplay(awt_display, adata->awt_visInfo.screen))
-+ {
-+ rootWindow = compositeGetOverlayWindow(awt_display, rootWindow);
-+ }
-+
- image = getWindowImage(awt_display, rootWindow, x, y, width, height);
-
- /* Array to use to crunch around the pixel values */
-@@ -412,3 +485,8 @@
-
- AWT_UNLOCK();
- }
-+
-+JNIEXPORT void JNICALL
-+Java_sun_awt_X11_XRobotPeer_loadNativeLibraries (JNIEnv *env, jclass cls) {
-+ initXCompositeFunctions();
-+}
-
diff --git a/jdk8160748-aarch64_ideal_reg.patch b/jdk8160748-aarch64_ideal_reg.patch
new file mode 100644
index 0000000..b3e6ea6
--- /dev/null
+++ b/jdk8160748-aarch64_ideal_reg.patch
@@ -0,0 +1,39 @@
+# HG changeset patch
+# User kbarrett
+# Date 1547614745 0
+# Wed Jan 16 04:59:05 2019 +0000
+# Node ID bca8195a3bc70df281a73d9a40032c673971676c
+# Parent 09abae195e9a7e134a1cfd9b375a6f4d95091de7
+8160748: [AArch64] Inconsistent types for ideal_reg
+Summary: Made ideal_reg consistently uint.
+Reviewed-by: kvn, iveresov
+
+diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad
openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+--- openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad
++++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad
+@@ -1,6 +1,6 @@
+ //
++// Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ // Copyright (c) 2013, Red Hat Inc.
+-// Copyright (c) 2003, 2012, Oracle and/or its affiliates.
+ // All rights reserved.
+ // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ //
+@@ -3449,7 +3449,7 @@
+ }
+
+ // Vector ideal reg.
+-const int Matcher::vector_ideal_reg(int len) {
++const uint Matcher::vector_ideal_reg(int len) {
+ switch(len) {
+ case 8: return Op_VecD;
+ case 16: return Op_VecX;
+@@ -3458,7 +3458,7 @@
+ return 0;
+ }
+
+-const int Matcher::vector_shift_count_ideal_reg(int size) {
++const uint Matcher::vector_shift_count_ideal_reg(int size) {
+ return Op_VecX;
+ }
+
diff --git a/jdk8185723-pr3553-zero_segfaults_on_power_pc_32_bit.patch
b/jdk8185723-pr3553-zero_segfaults_on_power_pc_32_bit.patch
deleted file mode 100644
index f8ee50a..0000000
--- a/jdk8185723-pr3553-zero_segfaults_on_power_pc_32_bit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1501690960 -3600
-# Wed Aug 02 17:22:40 2017 +0100
-# Node ID 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-# Parent 4e2adbc3d2b512f6b2bf318d2db60f4d1903f8c7
-8185723, PR3553: Zero: segfaults on Power PC 32-bit
-Reviewed-by: roland
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -38,10 +38,10 @@
- static void atomic_copy64(volatile void *src, volatile void *dst) {
- #if defined(PPC32)
- double tmp;
-- asm volatile ("lfd %0, 0(%1)\n"
-- "stfd %0, 0(%2)\n"
-- : "=f"(tmp)
-- : "b"(src), "b"(dst));
-+ asm volatile ("lfd %0, %2\n"
-+ "stfd %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git
a/jdk8186461-pr3557-zeros_atomic_copy64_should_use_spe_instructions_on_linux_powerpcspe.patch
b/jdk8186461-pr3557-zeros_atomic_copy64_should_use_spe_instructions_on_linux_powerpcspe.patch
deleted file mode 100644
index cc8020c..0000000
---
a/jdk8186461-pr3557-zeros_atomic_copy64_should_use_spe_instructions_on_linux_powerpcspe.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User glaubitz
-# Date 1524889690 -3600
-# Sat Apr 28 05:28:10 2018 +0100
-# Node ID be1379a186ba527b32c93a83e04c9600735fe44b
-# Parent 91ab2eac9856ec86c16c0bedd32e0b87974ead6f
-8186461, PR3557: Zero's atomic_copy64() should use SPE instructions on
linux-powerpcspe
-Reviewed-by: aph
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -36,12 +36,18 @@
-
- // Atomically copy 64 bits of data
- static void atomic_copy64(volatile void *src, volatile void *dst) {
--#if defined(PPC32)
-+#if defined(PPC32) && !defined(__SPE__)
- double tmp;
- asm volatile ("lfd %0, %2\n"
- "stfd %0, %1\n"
- : "=&f"(tmp), "=Q"(*(volatile double*)dst)
- : "Q"(*(volatile double*)src));
-+#elif defined(PPC32) && defined(__SPE__)
-+ long tmp;
-+ asm volatile ("evldd %0, %2\n"
-+ "evstdd %0, %1\n"
-+ : "=&r"(tmp), "=Q"(*(volatile long*)dst)
-+ : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
- asm volatile ("ld %0, 0(%1)\n"
diff --git
a/jdk8188030-pr3459-rh1484079-awt_java_apps_fail_to_start_when_some_minimal_fonts_are_present.patch
b/jdk8188030-pr3459-rh1484079-awt_java_apps_fail_to_start_when_some_minimal_fonts_are_present.patch
deleted file mode 100644
index 8564c81..0000000
---
a/jdk8188030-pr3459-rh1484079-awt_java_apps_fail_to_start_when_some_minimal_fonts_are_present.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User neugens
-# Date 1507735508 -3600
-# Wed Oct 11 16:25:08 2017 +0100
-# Node ID 5b91bf11d0f41a6124ffb0fcd8870507b50bd734
-# Parent 7b1a2f967cd8e950fe7dc47d716af13d36239a38
-8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are
present
-Summary: Handle CFF fonts
-Reviewed-by: andrew, prr
-
-diff --git a/src/solaris/native/sun/awt/fontpath.c
b/src/solaris/native/sun/awt/fontpath.c
---- openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-+++ openjdk/jdk/src/solaris/native/sun/awt/fontpath.c
-@@ -1233,6 +1233,7 @@
- && (strcmp((char*)fontformat, "TrueType") != 0)
- #if defined(__linux__) || defined(_AIX)
- && (strcmp((char*)fontformat, "Type 1") != 0)
-+ && (strcmp((char*)fontformat, "CFF") != 0)
- #endif
- ) {
- continue;
diff --git a/jdk8189170-aarch64_primordial_thread.patch
b/jdk8189170-aarch64_primordial_thread.patch
new file mode 100644
index 0000000..876cfdf
--- /dev/null
+++ b/jdk8189170-aarch64_primordial_thread.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User dbuck
+# Date 1547622839 0
+# Wed Jan 16 07:13:59 2019 +0000
+# Node ID 34c6b4b813caf9b3a6fd1859596a87a24a49c423
+# Parent bca8195a3bc70df281a73d9a40032c673971676c
+8189170: [AArch64] Add option to disable stack overflow checking in primordial thread for
use with JNI_CreateJavaJVM
+Reviewed-by: dcubed
+
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -550,8 +550,8 @@
+ // pthread_attr_getstack()
+
+ static void current_stack_region(address * bottom, size_t * size) {
+- if (os::Linux::is_initial_thread()) {
+- // initial thread needs special handling because pthread_getattr_np()
++ if (os::is_primordial_thread()) {
++ // primordial thread needs special handling because pthread_getattr_np()
+ // may return bogus value.
+ *bottom = os::Linux::initial_thread_stack_bottom();
+ *size = os::Linux::initial_thread_stack_size();
diff --git
a/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
index fc60cd3..6d7f743 100644
--- a/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
+++ b/jdk8197429-pr3546-rh1536622-increased_stack_guard_causes_segfaults_on_x86_32.patch
@@ -1,14 +1,16 @@
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.cpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.cpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -674,6 +674,10 @@
+# HG changeset patch
+# User aph
+# Date 1530894306 -3600
+# Fri Jul 06 17:25:06 2018 +0100
+# Node ID 1485461a0fd1ff977a6acb8f2ed1069aaaf3b07e
+# Parent d7bcbcfde5057ad066ad2fb55a87d19a5827ddee
+8197429: Increased stack guard causes segfaults on x86-32
+Reviewed-by: dholmes
+
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -724,6 +724,10 @@
}
}
@@ -19,17 +21,10 @@ diff -r eecfc14e66ee src/os/linux/vm/os_linux.cpp
bool os::Linux::manually_expand_stack(JavaThread * t, address addr) {
assert(t!=NULL, "just checking");
assert(t->osthread()->expanding_stack(), "expand should be set");
-diff -r eecfc14e66ee src/os/linux/vm/os_linux.hpp
---- openjdk/hotspot/src/os/linux/vm/os_linux.hpp Mon Jan 22 16:25:24 2018 +0000
-+++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp Wed Feb 21 13:52:31 2018 +0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -245,6 +245,8 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp
openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.hpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.hpp
+@@ -249,6 +249,8 @@
static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const
struct timespec *_abstime);
private:
@@ -38,17 +33,10 @@ diff -r eecfc14e66ee src/os/linux/vm/os_linux.hpp
typedef int (*sched_getcpu_func_t)(void);
typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int
bufferlen);
typedef int (*numa_max_node_func_t)(void);
-diff -r eecfc14e66ee src/os_cpu/linux_x86/vm/os_linux_x86.cpp
---- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Mon Jan 22 16:25:24 2018
+0000
-+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp Wed Feb 21 13:52:31 2018
+0000
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -892,6 +892,25 @@
+diff --git openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+@@ -892,6 +892,27 @@
void os::workaround_expand_exec_shield_cs_limit() {
#if defined(IA32)
size_t page_size = os::vm_page_size();
@@ -65,16 +53,18 @@ diff -r eecfc14e66ee src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+ * in Java code.
+ *
+ */
-+ if (os::Linux::is_initial_thread()) {
++ if (os::is_primordial_thread()) {
+ address limit = Linux::initial_thread_stack_bottom();
-+ limit += (StackYellowPages + StackRedPages) * page_size;
++ if (! DisablePrimordialThreadGuardPages) {
++ limit += (StackYellowPages + StackRedPages) * page_size;
++ }
+ os::Linux::expand_stack_to(limit);
+ }
+
/*
* Take the highest VA the OS will give us and exec
*
-@@ -910,6 +929,16 @@
+@@ -910,6 +931,16 @@
char* hint = (char*) (Linux::initial_thread_stack_bottom() -
((StackYellowPages + StackRedPages + 1) * page_size));
char* codebuf = os::attempt_reserve_memory_at(page_size, hint);
@@ -91,3 +81,206 @@ diff -r eecfc14e66ee src/os_cpu/linux_x86/vm/os_linux_x86.cpp
if ( (codebuf == NULL) || (!os::commit_memory(codebuf, page_size, true)) ) {
return; // No matter, we tried, best effort.
}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/T.java
openjdk/hotspot/test/runtime/StackGap/T.java
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/T.java
+@@ -0,0 +1,33 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit
www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++public class T {
++
++ public static void test(int n) {
++ if (n == 0) return;
++ System.out.println (n);
++ test (n - 1);
++
++ }
++
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/exestack-gap.c
openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/exestack-gap.c
+@@ -0,0 +1,82 @@
++/*
++ * Copyright (c) 2018, Red Hat, Inc. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit
www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++#include <jni.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++JNIEnv* create_vm(JavaVM **jvm, char *extra_option)
++{
++ JNIEnv* env;
++ JavaVMInitArgs args;
++ JavaVMOption options[4];
++ args.version = JNI_VERSION_1_8;
++ args.nOptions = 3 + (extra_option != NULL);
++ options[0].optionString = "-Xss2048k";
++ char classpath[4096];
++ snprintf(classpath, sizeof classpath,
++ "-Djava.class.path=%s", getenv("CLASSPATH"));
++ options[1].optionString = classpath;
++ options[2].optionString = "-XX:+UnlockExperimentalVMOptions";
++ if (extra_option) {
++ options[3].optionString = extra_option;
++ }
++ args.options = &options[0];
++ args.ignoreUnrecognized = 0;
++ int rv;
++ rv = JNI_CreateJavaVM(jvm, (void**)&env, &args);
++ if (rv < 0) return NULL;
++ return env;
++}
++
++void run(char *extra_arg) {
++ JavaVM *jvm;
++ jclass T_class;
++ jmethodID test_method;
++ JNIEnv *env = create_vm(&jvm, extra_arg);
++ if (env == NULL)
++ exit(1);
++ T_class = (*env)->FindClass(env, "T");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ test_method = (*env)->GetStaticMethodID(env, T_class, "test",
"(I)V");
++ if ((*env)->ExceptionCheck(env) == JNI_TRUE) {
++ (*env)->ExceptionDescribe(env);
++ exit(1);
++ }
++ (*env)->CallStaticVoidMethod(env, T_class, test_method, 1000);
++}
++
++
++int main(int argc, char **argv)
++{
++ if (argc > 1) {
++ run(argv[1]);
++ } else {
++ run(NULL);
++ }
++
++ return 0;
++}
+diff --git openjdk.orig/hotspot/test/runtime/StackGap/testme.sh
openjdk/hotspot/test/runtime/StackGap/testme.sh
+new file mode 100644
+--- /dev/null
++++ openjdk/hotspot/test/runtime/StackGap/testme.sh
+@@ -0,0 +1,73 @@
++# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit
www.oracle.com if you need additional information or have any
++# questions.
++#!/bin/sh
++
++#
++# @test testme.sh
++# @bug 8197429
++# @summary Linux kernel stack guard should not cause segfaults on x86-32
++# @compile T.java
++# @run shell testme.sh
++#
++
++if [ "${TESTSRC}" = "" ]
++then
++ TESTSRC=${PWD}
++ echo "TESTSRC not set. Using "${TESTSRC}" as default"
++fi
++echo "TESTSRC=${TESTSRC}"
++## Adding common setup Variables for running shell tests.
++. ${TESTSRC}/../../test_env.sh
++
++if [ "${VM_OS}" != "linux" ]
++then
++ echo "Test only valid for Linux"
++ exit 0
++fi
++
++gcc_cmd=`which gcc`
++if [ "x$gcc_cmd" = "x" ]; then
++ echo "WARNING: gcc not found. Cannot execute test." 2>&1
++ exit 0;
++fi
++
++CFLAGS="-m${VM_BITS}"
++
++LD_LIBRARY_PATH=.:${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE}:/usr/lib:$LD_LIBRARY_PATH
++export LD_LIBRARY_PATH
++
++cp ${TESTSRC}${FS}exestack-gap.c .
++
++# Copy the result of our @compile action:
++cp ${TESTCLASSES}${FS}T.class .
++
++echo "Compilation flag: ${COMP_FLAG}"
++# Note pthread may not be found thus invoke creation will fail to be created.
++# Check to ensure you have a /usr/lib/libpthread.so if you don't please look
++# for /usr/lib/`uname -m`-linux-gnu version ensure to add that path to below
compilation.
++
++$gcc_cmd -DLINUX ${CFLAGS} -o stack-gap \
++ -I${COMPILEJAVA}/include -I${COMPILEJAVA}/include/linux \
++ -L${COMPILEJAVA}/jre/lib/${VM_CPU}/${VM_TYPE} \
++ -ljvm -lpthread exestack-gap.c
++
++./stack-gap || exit $?
++./stack-gap -XX:+DisablePrimordialThreadGuardPages || exit $?
diff --git
a/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
index 900e0c3..533ea2d 100644
--- a/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
+++ b/jdk8199936-pr3533-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x.patch
@@ -7,10 +7,35 @@
PR3533: HotSpot generates code with unaligned stack, crashes on SSE operations
Summary: Enable -mstackrealign on x86 Linux as well as x86 Mac OS X
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -389,6 +389,21 @@
+ AC_SUBST($2CXXSTD_CXXFLAG)
+ fi
+
++ #
++ # NOTE: check for -mstackrealign needs to be below potential addition of -m32
++ #
++ if test "x$OPENJDK_TARGET_CPU" = xx86 && test
"x$OPENJDK_TARGET_OS" = xmacosx -o \
++ "x$OPENJDK_TARGET_OS" =
xlinux; then
++ # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
++ # While waiting for a better solution, the current workaround is to use
-mstackrealign
++ # This is also required on Linux systems which use libraries compiled with SSE
instructions
++ REALIGN_CFLAG="-mstackrealign"
++ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
++ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to
put another compiler in the path.])
++ )
++ AC_SUBST([REALIGN_CFLAG])
++ fi
++
+ if test "x$CFLAGS" != "x${ADDED_CFLAGS}"; then
+ AC_MSG_WARN([Ignoring CFLAGS($CFLAGS) found in environment. Use
--with-extra-cflags])
+ fi
diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in
openjdk///common/autoconf/hotspot-spec.gmk.in
--- openjdk.orig///common/autoconf/hotspot-spec.gmk.in
+++ openjdk///common/autoconf/hotspot-spec.gmk.in
-@@ -110,7 +110,8 @@
+@@ -112,7 +112,8 @@
RC:=@HOTSPOT_RC@
EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
@@ -23,7 +48,7 @@ diff --git openjdk.orig///common/autoconf/hotspot-spec.gmk.in
openjdk///common/a
diff --git openjdk.orig///common/autoconf/spec.gmk.in
openjdk///common/autoconf/spec.gmk.in
--- openjdk.orig///common/autoconf/spec.gmk.in
+++ openjdk///common/autoconf/spec.gmk.in
-@@ -333,6 +333,7 @@
+@@ -334,6 +334,7 @@
NO_DELETE_NULL_POINTER_CHECKS_CFLAG=@NO_DELETE_NULL_POINTER_CHECKS_CFLAG@
NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@
@@ -31,35 +56,3 @@ diff --git openjdk.orig///common/autoconf/spec.gmk.in
openjdk///common/autoconf/
CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@
CXX:=@FIXPATH@ @CCACHE@ @CXX@
-diff --git openjdk.orig///common/autoconf/toolchain.m4
openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -796,20 +796,16 @@
- #
- # NOTE: check for -mstackrealign needs to be below potential addition of -m32
- #
-- if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test
"x$OPENJDK_TARGET_OS" = xmacosx; then
-+ if test "x$OPENJDK_TARGET_CPU" = xx86 && test
"x$OPENJDK_TARGET_OS" = xmacosx -o \
-+ "x$OPENJDK_TARGET_OS" =
xlinux; then
- # On 32-bit MacOSX the OS requires C-entry points to be 16 byte aligned.
-- # While waiting for a better solution, the current workaround is to use
-mstackrealign.
-- CFLAGS="$CFLAGS -mstackrealign"
-- AC_MSG_CHECKING([if 32-bit compiler supports -mstackrealign])
-- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],
-- [
-- AC_MSG_RESULT([yes])
-- ],
-- [
-- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try
to put another compiler in the path.])
-- ]
-+ # While waiting for a better solution, the current workaround is to use
-mstackrealign
-+ # This is also required on Linux systems which use libraries compiled with SSE
instructions
-+ REALIGN_CFLAG="-mstackrealign"
-+ TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
-+ AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to
put another compiler in the path.])
- )
-+ AC_SUBST([REALIGN_CFLAG])
- fi
-
- C_FLAG_DEPS="-MMD -MF"
diff --git
a/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
index e287590..7ac077b 100644
---
a/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
+++
b/jdk8199936-pr3591-enable_mstackrealign_on_x86_linux_as_well_as_x86_mac_os_x_jdk.patch
@@ -6,11 +6,11 @@
# Parent 00ccc73498628a51a45301322e64ce2ad06e49be
PR3591: Fix for bug 3533 doesn't add -mstackrealign to JDK code
-diff --git openjdk.orig///common/autoconf/toolchain.m4
openjdk///common/autoconf/toolchain.m4
---- openjdk.orig///common/autoconf/toolchain.m4
-+++ openjdk///common/autoconf/toolchain.m4
-@@ -794,6 +794,8 @@
- TOOLCHAIN_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -401,6 +401,8 @@
+ FLAGS_COMPILER_CHECK_ARGUMENTS([$REALIGN_CFLAG -Werror], [],
AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to
put another compiler in the path.])
)
+ CFLAGS_JDK="${CFLAGS_JDK} ${REALIGN_CFLAG}"
diff --git a/jdk8201495-zero_reduce_limits_of_max_heap_size_for_boot_JDK_on_s390.patch
b/jdk8201495-zero_reduce_limits_of_max_heap_size_for_boot_JDK_on_s390.patch
deleted file mode 100644
index d42d05b..0000000
--- a/jdk8201495-zero_reduce_limits_of_max_heap_size_for_boot_JDK_on_s390.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-
-# HG changeset patch
-# User sgehwolf
-# Date 1525428026 -3600
-# Node ID 7129b977c4af021b1c9bbd7bbd334677213940d4
-# Parent 888144400d978e40a004dd8b908025a31135c092
-8201495: [Zero] Reduce limits of max heap size for boot JDK on s390
-Reviewed-by: andrew
-
-diff -r 888144400d97 -r 7129b977c4af common/autoconf/boot-jdk.m4
---- openjdk.orig/common/autoconf/boot-jdk.m4 Thu Apr 19 03:58:58 2018 -0700
-+++ openjdk/common/autoconf/boot-jdk.m4 Fri May 04 11:00:26 2018 +0100
-@@ -334,7 +334,7 @@
- # Maximum amount of heap memory.
- # Maximum stack size.
- if test "x$BOOT_JDK_BITS" = x32; then
-- JVM_MAX_HEAP=1100M
-+ JVM_MAX_HEAP=768M
- STACK_SIZE=768
- else
- # Running Javac on a JVM on a 64-bit machine, takes more space since 64-bit
diff --git
a/jdk8201509-pr3579-zero_S390_31bit_atomic_copy64_inline_assembler_is_wrong.patch
b/jdk8201509-pr3579-zero_S390_31bit_atomic_copy64_inline_assembler_is_wrong.patch
deleted file mode 100644
index 132c225..0000000
--- a/jdk8201509-pr3579-zero_S390_31bit_atomic_copy64_inline_assembler_is_wrong.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# HG changeset patch
-# User mbalao
-# Date 1525317412 -3600
-# Thu May 03 04:16:52 2018 +0100
-# Node ID de79964656fc652f2085dac4fe99bcc128b5a3b1
-# Parent ffd5260fe5adcb26f87a14f1aaaf3e1a075d712a
-8201509, PR3579: Zero: S390 31bit atomic_copy64 inline assembler is wrong
-Summary: The inline assembler for the S390 (S390 and not _LP64) has src and dst reversed
thereby corrupting data
-Reviewed-by: shade
-
-diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
---- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
-@@ -1,6 +1,6 @@
- /*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-- * Copyright 2007, 2008, 2010 Red Hat, Inc.
-+ * Copyright 2007, 2008, 2010, 2018, Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
-@@ -50,10 +50,10 @@
- : "Q"(*(volatile long*)src));
- #elif defined(S390) && !defined(_LP64)
- double tmp;
-- asm volatile ("ld %0, 0(%1)\n"
-- "std %0, 0(%2)\n"
-- : "=r"(tmp)
-- : "a"(src), "a"(dst));
-+ asm volatile ("ld %0, %2\n"
-+ "std %0, %1\n"
-+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
-+ : "Q"(*(volatile double*)src));
- #elif defined(__ARM_ARCH_7A__)
- jlong tmp;
- asm volatile ("ldrexd %0, [%1]\n"
diff --git
a/jdk8203182-pr3603-rh1568033_release_session_if_initialization_of_sunpkcs11_signature_fails.patch
b/jdk8203182-pr3603-rh1568033_release_session_if_initialization_of_sunpkcs11_signature_fails.patch
deleted file mode 100644
index 031a60c..0000000
---
a/jdk8203182-pr3603-rh1568033_release_session_if_initialization_of_sunpkcs11_signature_fails.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-# HG changeset patch
-# User igerasim
-# Date 1528992969 25200
-# Thu Jun 14 09:16:09 2018 -0700
-# Node ID d9b0b4bd2526818afa73b60da77403245554caa8
-# Parent 1f4b038b9550afaf88a70cee4cf9c1422ecd86d6
-8203182, PR3603: Release session if initialization of SunPKCS11 Signature fails
-Summary: Ensure session is properly released in P11Signature class
-Reviewed-by: valeriep
-Contributed-by: Martin Balao <mbalao(a)redhat.com>
-
-diff --git openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Signature.java
-@@ -309,47 +309,51 @@
- session = token.killSession(session);
- return;
- }
-- // "cancel" operation by finishing it
-- // XXX make sure all this always works correctly
-- if (mode == M_SIGN) {
-- try {
-- if (type == T_UPDATE) {
-- token.p11.C_SignFinal(session.id(), 0);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-+ try {
-+ // "cancel" operation by finishing it
-+ // XXX make sure all this always works correctly
-+ if (mode == M_SIGN) {
-+ try {
-+ if (type == T_UPDATE) {
-+ token.p11.C_SignFinal(session.id(), 0);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Sign(session.id(), digest);
- }
-- token.p11.C_Sign(session.id(), digest);
-+ } catch (PKCS11Exception e) {
-+ throw new ProviderException("cancel failed", e);
- }
-- } catch (PKCS11Exception e) {
-- throw new ProviderException("cancel failed", e);
-+ } else { // M_VERIFY
-+ try {
-+ byte[] signature;
-+ if (keyAlgorithm.equals("DSA")) {
-+ signature = new byte[40];
-+ } else {
-+ signature = new byte[(p11Key.length() + 7) >> 3];
-+ }
-+ if (type == T_UPDATE) {
-+ token.p11.C_VerifyFinal(session.id(), signature);
-+ } else {
-+ byte[] digest;
-+ if (type == T_DIGEST) {
-+ digest = md.digest();
-+ } else { // T_RAW
-+ digest = buffer;
-+ }
-+ token.p11.C_Verify(session.id(), digest, signature);
-+ }
-+ } catch (PKCS11Exception e) {
-+ // will fail since the signature is incorrect
-+ // XXX check error code
-+ }
- }
-- } else { // M_VERIFY
-- try {
-- byte[] signature;
-- if (keyAlgorithm.equals("DSA")) {
-- signature = new byte[40];
-- } else {
-- signature = new byte[(p11Key.length() + 7) >> 3];
-- }
-- if (type == T_UPDATE) {
-- token.p11.C_VerifyFinal(session.id(), signature);
-- } else {
-- byte[] digest;
-- if (type == T_DIGEST) {
-- digest = md.digest();
-- } else { // T_RAW
-- digest = buffer;
-- }
-- token.p11.C_Verify(session.id(), digest, signature);
-- }
-- } catch (PKCS11Exception e) {
-- // will fail since the signature is incorrect
-- // XXX check error code
-- }
-+ } finally {
-+ session = token.releaseSession(session);
- }
- }
-
-@@ -368,6 +372,8 @@
- }
- initialized = true;
- } catch (PKCS11Exception e) {
-+ // release session when initialization failed
-+ session = token.releaseSession(session);
- throw new ProviderException("Initialization failed", e);
- }
- if (bytesProcessed != 0) {
-@@ -529,6 +535,8 @@
- }
- bytesProcessed += len;
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException(e);
- }
- break;
-@@ -576,6 +584,8 @@
- bytesProcessed += len;
- byteBuffer.position(ofs + len);
- } catch (PKCS11Exception e) {
-+ initialized = false;
-+ session = token.releaseSession(session);
- throw new ProviderException("Update failed", e);
- }
- break;
diff --git a/jdk8205104-pr3539-rh1548475-pass_extra_ldflags_to_hotspot_build.patch
b/jdk8205104-pr3539-rh1548475-pass_extra_ldflags_to_hotspot_build.patch
deleted file mode 100644
index 9b40a7f..0000000
--- a/jdk8205104-pr3539-rh1548475-pass_extra_ldflags_to_hotspot_build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1526065930 -3600
-# Fri May 11 20:12:10 2018 +0100
-# Node ID b8fc1e640c4c7f38ca94131279cb67c4d3de6961
-# Parent afb31413c73cbc06420fdb447aa90a7a38258904
-PR3539, RH1548475: Pass EXTRA_LDFLAGS to HotSpot build
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/jsig.make
openjdk/hotspot/make/aix/makefiles/jsig.make
---- openjdk.orig/hotspot/make/aix/makefiles/jsig.make
-+++ openjdk/hotspot/make/aix/makefiles/jsig.make
-@@ -45,7 +45,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- LFLAGS_JSIG += $(BIN_UTILS)
-
-diff --git openjdk.orig/hotspot/make/aix/makefiles/saproc.make
openjdk/hotspot/make/aix/makefiles/saproc.make
---- openjdk.orig/hotspot/make/aix/makefiles/saproc.make
-+++ openjdk/hotspot/make/aix/makefiles/saproc.make
-@@ -66,7 +66,7 @@
- endif
-
-
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
- $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-diff --git openjdk.orig/hotspot/make/aix/makefiles/vm.make
openjdk/hotspot/make/aix/makefiles/vm.make
---- openjdk.orig/hotspot/make/aix/makefiles/vm.make
-+++ openjdk/hotspot/make/aix/makefiles/vm.make
-@@ -117,7 +117,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
openjdk/hotspot/make/bsd/makefiles/jsig.make
---- openjdk.orig/hotspot/make/bsd/makefiles/jsig.make
-+++ openjdk/hotspot/make/bsd/makefiles/jsig.make
-@@ -52,7 +52,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
-+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
openjdk/hotspot/make/bsd/makefiles/saproc.make
---- openjdk.orig/hotspot/make/bsd/makefiles/saproc.make
-+++ openjdk/hotspot/make/bsd/makefiles/saproc.make
-@@ -114,7 +114,7 @@
- # bring in minimum version argument or we'll fail on OSX 10.10
- SA_LFLAGS = $(LFLAGS)
- endif
--SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS += $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- BOOT_JAVA_INCLUDES = -I$(BOOT_JAVA_HOME)/include \
- -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]"
"[:lower:]")
-diff --git openjdk.orig/hotspot/make/bsd/makefiles/vm.make
openjdk/hotspot/make/bsd/makefiles/vm.make
---- openjdk.orig/hotspot/make/bsd/makefiles/vm.make
-+++ openjdk/hotspot/make/bsd/makefiles/vm.make
-@@ -119,7 +119,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make
openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -44,7 +44,7 @@
- # cause problems with interposing. See CR: 6466665
- # LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
-
--LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE)
$(LDFLAGS_NO_EXEC_STACK)
-+LFLAGS_JSIG += -D_GNU_SOURCE -D_REENTRANT $(LDFLAGS_HASH_STYLE) $(LDFLAGS_NO_EXEC_STACK)
$(EXTRA_LDFLAGS)
-
- # DEBUG_BINARIES overrides everything, use full -g debug information
- ifeq ($(DEBUG_BINARIES), true)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make
openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -73,7 +73,7 @@
- else
- ALT_SAINCDIR=
- endif
--SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
-+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE) $(EXTRA_LDFLAGS)
-
- SAARCH ?= $(BUILDARCH)
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make
openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -122,7 +122,7 @@
-
- # Extra flags from gnumake's invocation or environment
- CFLAGS += $(EXTRA_CFLAGS)
--LFLAGS += $(EXTRA_CFLAGS)
-+LFLAGS += $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)
-
- # Don't set excutable bit on stack segment
- # the same could be done by separate execstack command
diff --git
a/jdk8206406-pr3610-rh1597825-tubcodedesc_constructor_publishes_partially_constructed_objects_on_stubCodeDesc_list.patch
b/jdk8206406-pr3610-rh1597825-tubcodedesc_constructor_publishes_partially_constructed_objects_on_stubCodeDesc_list.patch
deleted file mode 100644
index 0f38126..0000000
---
a/jdk8206406-pr3610-rh1597825-tubcodedesc_constructor_publishes_partially_constructed_objects_on_stubCodeDesc_list.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-# HG changeset patch
-# User aph
-# Date 1531146945 -3600
-# Mon Jul 09 15:35:45 2018 +0100
-# Node ID 95b72537801cc9946c27ad27f07e3f0790a21b08
-# Parent f6341f4635dacb56678264d29a88cd052b74036b
-8206406, PR3610, RH1597825: StubCodeDesc constructor publishes partially-constructed
objects on StubCodeDesc::_list
-Reviewed-by: dholmes
-
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.cpp
-@@ -34,12 +34,12 @@
-
- // Implementation of StubCodeDesc
-
--StubCodeDesc* StubCodeDesc::_list = NULL;
--int StubCodeDesc::_count = 0;
-+StubCodeDesc* volatile StubCodeDesc::_list = NULL;
-+int StubCodeDesc::_count = 0;
-
-
- StubCodeDesc* StubCodeDesc::desc_for(address pc) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && !p->contains(pc)) p = p->_next;
- // p == NULL || p->contains(pc)
- return p;
-@@ -47,7 +47,7 @@
-
-
- StubCodeDesc* StubCodeDesc::desc_for_index(int index) {
-- StubCodeDesc* p = _list;
-+ StubCodeDesc* p = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- while (p != NULL && p->index() != index) p = p->_next;
- return p;
- }
-diff --git openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
---- openjdk.orig/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-+++ openjdk/hotspot/src/share/vm/runtime/stubCodeGenerator.hpp
-@@ -38,7 +38,7 @@
-
- class StubCodeDesc: public CHeapObj<mtCode> {
- protected:
-- static StubCodeDesc* _list; // the list of all descriptors
-+ static StubCodeDesc* volatile _list; // the list of all descriptors
- static int _count; // length of list
-
- StubCodeDesc* _next; // the next element in the linked list
-@@ -69,13 +69,13 @@
-
- StubCodeDesc(const char* group, const char* name, address begin) {
- assert(name != NULL, "no name specified");
-- _next = _list;
-+ _next = (StubCodeDesc*)OrderAccess::load_ptr_acquire(&_list);
- _group = group;
- _name = name;
- _index = ++_count; // (never zero)
- _begin = begin;
- _end = NULL;
-- _list = this;
-+ OrderAccess::release_store_ptr(&_list, this);
- };
-
- const char* group() const { return _group; }
diff --git
a/jdk8206425-gnu_debuglink_sections_added_unconditionally_when_no_debuginfo_is_stripped.patch
b/jdk8206425-gnu_debuglink_sections_added_unconditionally_when_no_debuginfo_is_stripped.patch
deleted file mode 100644
index adbf1f0..0000000
---
a/jdk8206425-gnu_debuglink_sections_added_unconditionally_when_no_debuginfo_is_stripped.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-# HG changeset patch
-# User sgehwolf
-# Date 1530808022 -7200
-# Thu Jul 05 18:27:02 2018 +0200
-# Node ID 5ba59d58d976db456c4455640111e8107b8d80e8
-# Parent ad057f2e3211cd18bc56550d8a2c400d92ec35b1
-8206425: .gnu_debuglink sections added unconditionally when no debuginfo is stripped
-Summary: Only add .gnu_debuglink sections when there is some stripping done.
-Reviewed-by: erikj, dholmes
-
-diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make
openjdk/hotspot/make/linux/makefiles/jsig.make
---- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
-+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -57,14 +57,15 @@
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $<
-ldl
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/saproc.make
openjdk/hotspot/make/linux/makefiles/saproc.make
---- openjdk.orig/hotspot/make/linux/makefiles/saproc.make
-+++ openjdk/hotspot/make/linux/makefiles/saproc.make
-@@ -100,14 +100,15 @@
- -lthread_db
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO)
-diff --git openjdk.orig/hotspot/make/linux/makefiles/vm.make
openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make
-+++ openjdk/hotspot/make/linux/makefiles/vm.make
-@@ -358,14 +358,15 @@
-
- ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
-+ ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
-- ifeq ($(STRIP_POLICY),all_strip)
- $(QUIETLY) $(STRIP) $@
- else
- ifeq ($(STRIP_POLICY),min_strip)
-+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
- $(QUIETLY) $(STRIP) -g $@
-+ endif
- # implied else here is no stripping at all
-- endif
- endif
- ifeq ($(ZIP_DEBUGINFO_FILES),1)
- $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO)
diff --git a/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
index 7f57c0a..e4a007c 100644
--- a/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
+++ b/jdk8207057-pr3613-no_debug_info_for_assembler_files_root.patch
@@ -1,34 +1,29 @@
---- openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.783695320 +0200
-+++ openjdk/common/autoconf/toolchain.m4 2018-09-17 15:35:40.608695635 +0200
-@@ -814,6 +814,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
-
- C_FLAG_DEPS="-MMD -MF"
- CXX_FLAG_DEPS="-MMD -MF"
-+ # By default don't set any specific assembler debug
-+ # info flags for toolchains unless we know they work.
-+ # See JDK-8207057.
-+ ASFLAGS_DEBUG_SYMBOLS=""
-
- case $COMPILER_TYPE in
- CC )
-@@ -842,6 +846,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- CFLAGS_DEBUG_SYMBOLS="-g1"
- CXXFLAGS_DEBUG_SYMBOLS="-g1"
- fi
-+ ASFLAGS_DEBUG_SYMBOLS="-g"
- ;;
- ossc )
- #
-@@ -969,6 +974,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_OPTIMIZATION],
- AC_SUBST(CXX_O_FLAG_NONE)
- AC_SUBST(C_FLAG_DEPS)
- AC_SUBST(CXX_FLAG_DEPS)
+diff --git openjdk.orig///common/autoconf/flags.m4 openjdk///common/autoconf/flags.m4
+--- openjdk.orig///common/autoconf/flags.m4
++++ openjdk///common/autoconf/flags.m4
+@@ -282,9 +282,11 @@
+ if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test
"x$DEBUG_LEVEL" = "xfastdebug"; then
+ CFLAGS_DEBUG_SYMBOLS="-g1"
+ CXXFLAGS_DEBUG_SYMBOLS="-g1"
++ ASFLAGS_DEBUG_SYMBOLS="-g1"
+ else
+ CFLAGS_DEBUG_SYMBOLS="-g"
+ CXXFLAGS_DEBUG_SYMBOLS="-g"
++ ASFLAGS_DEBUG_SYMBOLS="-g"
+ fi
+ elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+ CFLAGS_DEBUG_SYMBOLS="-g -xs"
+@@ -295,6 +297,7 @@
+ fi
+ AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
+ AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
+ AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
- ])
- AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
---- openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.324690758 +0200
-+++ openjdk/common/autoconf/spec.gmk.in 2018-09-17 15:35:43.169691036 +0200
+ # Optimization levels
+ if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
+diff --git openjdk.orig///common/autoconf/spec.gmk.in
openjdk///common/autoconf/spec.gmk.in
+--- openjdk.orig///common/autoconf/spec.gmk.in
++++ openjdk///common/autoconf/spec.gmk.in
@@ -414,6 +414,7 @@
# Options for generating debug symbols
ENABLE_DEBUG_SYMBOLS:=@ENABLE_DEBUG_SYMBOLS@
@@ -37,3 +32,21 @@
CXXFLAGS_DEBUG_SYMBOLS:=@CXXFLAGS_DEBUG_SYMBOLS@
ZIP_DEBUGINFO_FILES:=@ZIP_DEBUGINFO_FILES@
STRIP_POLICY:=@STRIP_POLICY@
+diff --git openjdk.orig///make/common/NativeCompilation.gmk
openjdk///make/common/NativeCompilation.gmk
+--- openjdk.orig///make/common/NativeCompilation.gmk
++++ openjdk///make/common/NativeCompilation.gmk
+@@ -351,12 +351,14 @@
+ # Always add debug symbols
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ else
+ # Programs don't get the debug symbols added in the old build. It's not
clear if
+ # this is intentional.
+ ifeq ($$($1_PROGRAM),)
+ $1_EXTRA_CFLAGS+=$(CFLAGS_DEBUG_SYMBOLS)
+ $1_EXTRA_CXXFLAGS+=$(CXXFLAGS_DEBUG_SYMBOLS)
++ $1_EXTRA_ASFLAGS+=$(ASFLAGS_DEBUG_SYMBOLS)
+ endif
+ endif
+ endif
diff --git a/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
index 5f30e59..be2650b 100644
--- a/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
+++ b/jdk8210761-rh1632174-libjsig_is_being_compiled_without_optimization.patch
@@ -1,7 +1,16 @@
+# HG changeset patch
+# User sgehwolf
+# Date 1537541916 -7200
+# Fri Sep 21 16:58:36 2018 +0200
+# Node ID 4010c90156d1bfeaf988dbfeb01520f2e3a66ea8
+# Parent 54afe70c50b6a6685763d00883e5173c0ba3a19d
+8210761: libjsig is being compiled without optimization
+Reviewed-by: erikj, ihse
+
diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make
openjdk/hotspot/make/linux/makefiles/jsig.make
--- openjdk.orig/hotspot/make/linux/makefiles/jsig.make
+++ openjdk/hotspot/make/linux/makefiles/jsig.make
-@@ -51,10 +51,15 @@ ifeq ($(DEBUG_BINARIES), true)
+@@ -51,10 +51,15 @@
JSIG_DEBUG_CFLAGS = -g
endif
@@ -11,10 +20,10 @@ diff --git openjdk.orig/hotspot/make/linux/makefiles/jsig.make
openjdk/hotspot/m
+endif
+
$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
- @echo Making signal interposition lib...
- $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+ @echo Making signal interposition lib...
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(EXTRA_CFLAGS) -o $@ $<
-ldl
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) $(JSIG_OPT_FLAGS)
$(EXTRA_CFLAGS) -o $@ $< -ldl
ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
- $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
- ifeq ($(STRIP_POLICY),all_strip)
+ ifneq ($(STRIP_POLICY),no_strip)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
diff --git a/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
index 48211dc..1c322fa 100644
--- a/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
+++ b/pr3559-use_ldrexd_for_atomic_reads_on_armv7_zero.patch
@@ -15,9 +15,9 @@ diff --git
openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp openj
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
@@ -54,6 +54,12 @@
- "std %0, 0(%2)\n"
- : "=r"(tmp)
- : "a"(src), "a"(dst));
+ "std %0, %1\n"
+ : "=&f"(tmp), "=Q"(*(volatile double*)dst)
+ : "Q"(*(volatile double*)src));
+#elif defined(__ARM_ARCH_7A__)
+ jlong tmp;
+ asm volatile ("ldrexd %0, [%1]\n"
diff --git
a/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
index b9ae9ab..2700f3c 100644
---
a/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
+++
b/pr3593-s390_use_z_format_specifier_for_size_t_arguments_as_size_t_not_equals_to_int.patch
@@ -1,6 +1,6 @@
-diff -r cf43a852f486 src/share/vm/asm/codeBuffer.cpp
---- openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp Wed Jan 13 05:30:26 2016 +0000
+diff --git openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp
openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
+--- openjdk.orig/hotspot/src/share/vm/asm/codeBuffer.cpp
++++ openjdk/hotspot/src/share/vm/asm/codeBuffer.cpp
@@ -977,7 +977,7 @@
for (int n = (int) CodeBuffer::SECT_FIRST; n < (int) CodeBuffer::SECT_LIMIT; n++)
{
CodeSection* sect = code_section(n);
@@ -10,10 +10,10 @@ diff -r cf43a852f486 src/share/vm/asm/codeBuffer.cpp
n, sect->limit() - sect->start(), sect->limit() -
sect->end());
}
xtty->print_cr("</blob>");
-diff -r cf43a852f486 src/share/vm/code/codeCache.cpp
---- openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/code/codeCache.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -191,7 +191,7 @@
+diff --git openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp
openjdk/hotspot/src/share/vm/code/codeCache.cpp
+--- openjdk.orig/hotspot/src/share/vm/code/codeCache.cpp
++++ openjdk/hotspot/src/share/vm/code/codeCache.cpp
+@@ -192,7 +192,7 @@
}
if (PrintCodeCacheExtension) {
ResourceMark rm;
@@ -22,21 +22,21 @@ diff -r cf43a852f486 src/share/vm/code/codeCache.cpp
(intptr_t)_heap->low_boundary(), (intptr_t)_heap->high(),
(address)_heap->high() - (address)_heap->low_boundary());
}
-diff -r cf43a852f486 src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
---- openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13
03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp Wed Jan 13
05:30:26 2016 +0000
-@@ -556,7 +556,7 @@
+diff --git openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
++++ openjdk/hotspot/src/share/vm/gc_implementation/g1/g1StringDedupTable.cpp
+@@ -598,7 +598,7 @@
" [Table]\n"
- " [Memory Usage: "G1_STRDEDUP_BYTES_FORMAT_NS"]\n"
- " [Size: "SIZE_FORMAT", Min: "SIZE_FORMAT", Max:
"SIZE_FORMAT"]\n"
-- " [Entries: "UINTX_FORMAT", Load:
"G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " UINTX_FORMAT ", Added:
"UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
-+ " [Entries: "UINTX_FORMAT", Load:
"G1_STRDEDUP_PERCENT_FORMAT_NS", Cached: " SIZE_FORMAT ", Added:
"UINTX_FORMAT", Removed: "UINTX_FORMAT"]\n"
- " [Resize Count: "UINTX_FORMAT", Shrink Threshold:
"UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS"), Grow Threshold:
"UINTX_FORMAT"("G1_STRDEDUP_PERCENT_FORMAT_NS")]\n"
- " [Rehash Count: "UINTX_FORMAT", Rehash Threshold:
"UINTX_FORMAT", Hash Seed: 0x%x]\n"
- " [Age Threshold: "UINTX_FORMAT"]",
-diff -r cf43a852f486 src/share/vm/memory/blockOffsetTable.cpp
---- openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 03:43:29 2016
+0000
-+++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp Wed Jan 13 05:30:26 2016
+0000
+ " [Memory Usage: " G1_STRDEDUP_BYTES_FORMAT_NS "]\n"
+ " [Size: " SIZE_FORMAT ", Min: " SIZE_FORMAT ", Max:
" SIZE_FORMAT "]\n"
+- " [Entries: " UINTX_FORMAT ", Load: "
G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " UINTX_FORMAT ", Added: "
UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
++ " [Entries: " UINTX_FORMAT ", Load: "
G1_STRDEDUP_PERCENT_FORMAT_NS ", Cached: " SIZE_FORMAT ", Added: "
UINTX_FORMAT ", Removed: " UINTX_FORMAT "]\n"
+ " [Resize Count: " UINTX_FORMAT ", Shrink Threshold: "
UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS "), Grow Threshold: "
UINTX_FORMAT "(" G1_STRDEDUP_PERCENT_FORMAT_NS ")]\n"
+ " [Rehash Count: " UINTX_FORMAT ", Rehash Threshold: "
UINTX_FORMAT ", Hash Seed: 0x%x]\n"
+ " [Age Threshold: " UINTX_FORMAT "]",
+diff --git openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp
openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/blockOffsetTable.cpp
++++ openjdk/hotspot/src/share/vm/memory/blockOffsetTable.cpp
@@ -57,7 +57,7 @@
gclog_or_tty->print_cr("BlockOffsetSharedArray::BlockOffsetSharedArray:
");
gclog_or_tty->print_cr(" "
@@ -46,10 +46,23 @@ diff -r cf43a852f486 src/share/vm/memory/blockOffsetTable.cpp
" rs end(): " INTPTR_FORMAT,
p2i(rs.base()), rs.size(), p2i(rs.base() + rs.size()));
gclog_or_tty->print_cr(" "
-diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
---- openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 03:43:29 2016 +0000
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp Wed Jan 13 05:30:26 2016 +0000
-@@ -1285,14 +1285,14 @@
+diff --git openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp
openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+--- openjdk.orig/hotspot/src/share/vm/memory/collectorPolicy.cpp
++++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp
+@@ -1055,7 +1055,8 @@
+ size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
+ assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu",
msp.initial_gen0_size(), expected));
+ assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
+- err_msg("NewSize should have been set ergonomically to %zu, but was
%zu", expected, NewSize));
++ err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT
", but was " UINTX_FORMAT,
++ expected, NewSize));
+ }
+
+ private:
+diff --git openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp
openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp
+@@ -1291,14 +1291,14 @@
}
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
@@ -67,7 +80,7 @@ diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
" max_heap: " SIZE_FORMAT,
min_heap_size(), InitialHeapSize, max_heap);
}
-@@ -1308,7 +1308,7 @@
+@@ -1314,7 +1314,7 @@
FLAG_SET_ERGO(uintx, NewSize, MIN2(preferred_max_new_size, (size_t)NewSize));
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
@@ -76,7 +89,7 @@ diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
}
}
// Unless explicitly requested otherwise, size old gen
-@@ -1318,7 +1318,7 @@
+@@ -1324,7 +1324,7 @@
FLAG_SET_ERGO(uintx, OldSize, MIN2((size_t)(NewRatio*NewSize), max_heap -
NewSize));
if (PrintGCDetails && Verbose) {
// Too early to use gclog_or_tty
@@ -85,7 +98,7 @@ diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
}
}
}
-@@ -1834,7 +1834,7 @@
+@@ -2043,7 +2043,7 @@
if (PrintGCDetails && Verbose) {
// Cannot use gclog_or_tty yet.
@@ -94,7 +107,7 @@ diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
}
FLAG_SET_ERGO(uintx, InitialHeapSize, (uintx)reasonable_initial);
}
-@@ -1844,7 +1844,7 @@
+@@ -2053,7 +2053,7 @@
set_min_heap_size(MIN2((uintx)reasonable_minimum, InitialHeapSize));
if (PrintGCDetails && Verbose) {
// Cannot use gclog_or_tty yet.
@@ -103,10 +116,10 @@ diff -r cf43a852f486 src/share/vm/runtime/arguments.cpp
}
}
}
-diff -r cf43a852f486 src/share/vm/utilities/globalDefinitions.hpp
---- openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 03:43:29 2016
+0000
-+++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp Wed Jan 13 05:30:26 2016
+0000
-@@ -1382,12 +1382,21 @@
+diff --git openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+@@ -1389,12 +1389,21 @@
#define INTPTR_FORMAT_W(width) "%" #width PRIxPTR
@@ -128,16 +141,3 @@ diff -r cf43a852f486 src/share/vm/utilities/globalDefinitions.hpp
#define INTX_FORMAT "%" PRIdPTR
#define UINTX_FORMAT "%" PRIuPTR
-diff -r 388e9d0905e6 src/share/vm/memory/collectorPolicy.cpp
---- openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp Mon Apr 11 11:33:18 2016
+0000
-+++ openjdk/hotspot/src/share/vm/memory/collectorPolicy.cpp Tue Apr 12 04:12:50 2016
+0100
-@@ -1056,7 +1056,8 @@
- size_t expected = msp.scale_by_NewRatio_aligned(initial_heap_size);
- assert(msp.initial_gen0_size() == expected, err_msg("%zu != %zu",
msp.initial_gen0_size(), expected));
- assert(FLAG_IS_ERGO(NewSize) && NewSize == expected,
-- err_msg("NewSize should have been set ergonomically to %zu, but was
%zu", expected, NewSize));
-+ err_msg("NewSize should have been set ergonomically to " SIZE_FORMAT
", but was " UINTX_FORMAT,
-+ expected, NewSize));
- }
-
- private:
diff --git
a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
index e29bdb9..d8f3a5a 100644
---
a/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
+++
b/rh1566890_speculative_store_bypass_so_added_more_per_task_speculation_control_CVE_2018_3639.patch
@@ -1,7 +1,7 @@
-# ssbd2.patch
---- ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp~ 2018-05-02 13:02:51.924489199 -0400
-+++ ./openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2018-05-02 13:04:57.274216581 -0400
-@@ -102,6 +102,8 @@
+diff --git openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -103,6 +103,8 @@
# include <inttypes.h>
# include <sys/ioctl.h>
@@ -10,7 +10,7 @@
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
#ifndef _GNU_SOURCE
-@@ -4892,6 +4894,31 @@
+@@ -4997,6 +4999,31 @@
}
}
@@ -39,6 +39,6 @@
+ prctl(PR_SET_SPECULATION_CTRL, PR_SPEC_STORE_BYPASS, PR_SPEC_DISABLE, 0, 0);
+}
+
- // this is called _before_ the most of global arguments have been parsed
+ // this is called _before_ most of the global arguments have been parsed
void os::init(void) {
char dummy; /* used to get a guess on initial stack address */
diff --git a/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
index 53fa41c..e319492 100644
--- a/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
+++ b/rh1649664-awt2dlibraries_compiled_with_no_strict_overflow.patch
@@ -1,7 +1,7 @@
-diff -r 1fe56343ecc8 make/lib/Awt2dLibraries.gmk
---- openjdk/jdk/make/lib/Awt2dLibraries.gmk Tue Jan 12 21:01:12 2016 +0000
-+++ openjdk/jdk/make/lib/Awt2dLibraries.gmk Thu Jan 14 00:47:01 2016 +0000
-@@ -904,6 +904,12 @@
+diff --git openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk
openjdk/jdk/make/lib/Awt2dLibraries.gmk
+--- openjdk.orig/jdk/make/lib/Awt2dLibraries.gmk
++++ openjdk/jdk/make/lib/Awt2dLibraries.gmk
+@@ -891,6 +891,12 @@
BUILD_LIBFONTMANAGER_ExtensionSubtables.cpp_CXXFLAGS := -fno-strict-aliasing
endif
@@ -11,6 +11,6 @@ diff -r 1fe56343ecc8 make/lib/Awt2dLibraries.gmk
+ BUILD_LIBFONTMANAGER_IndicRearrangementProcessor2.cpp_CXXFLAGS :=
-fno-strict-overflow
+endif
+
- $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \
- LIBRARY := fontmanager, \
- OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+ # LDFLAGS clarification:
+ # Filter relevant linker flags disallowing unresolved symbols as we cannot
+ # build-time decide to which library to link against (libawt_headless or
diff --git a/sources b/sources
index 34cf8d8..de3a0a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) =
cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b14.tar.xz) =
d2f3e618bf8fa8d8991f2db32b665d52170642fd375926f84b0cc40a7896278847f6374fcb6d095f681b72a170ac7189ec3501907c5ca0d3d454a09397eedcfa
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u192-b12.tar.xz) =
5fde4f3b2f8b903d650290f0745e8f4a8036d0dcec3642d66b0a5851eeaa6be40e2fd613916ecf27b7135b8038cab1d29968973678fd33d894fca7dd5ebb03f2
commit fbdbbed3061e253eb4059015a74b25cc78f966c7
Author: Andrew John Hughes <gnu_andrew(a)member.fsf.org>
Date: Tue Jan 29 11:36:44 2019 +0000
Add 8131048 & 8164920 (PR3574/RH1498936) to provide a CRC32 intrinsic for PPC64.
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index d4df5e9..66f632c 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -971,7 +971,7 @@ Provides: java-%{javaver}-%{origin}-accessibility =
%{epoch}:%{version}-%{releas
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{updatever}.%{buildver}
-Release: 0%{?dist}
+Release: 1%{?dist}
# java-1.5.0-ibm from
jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1246,6 +1246,10 @@ Patch7: jdk8044235-src_zip_should_include_all_sources.patch
Patch583: jdk8172850-rh1640127-01-register_allocator_crash.patch
# JDK-8209639, RH1640127: assert failure in coalesce.cpp: attempted to spill a
non-spillable item
Patch584: jdk8209639-rh1640127-02-coalesce_attempted_spill_non_spillable.patch
+# JDK-8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Patch586: jdk8131048-pr3574-rh1498936-ppc_crc32.patch
+# JDK-8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Patch587: jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
#############################################
#
@@ -1699,6 +1703,8 @@ sh %{SOURCE12}
%patch583
%patch584
%patch585
+%patch586
+%patch587
# RPM-only fixes
%patch525
@@ -2348,6 +2354,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Mon Jan 14 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-1
+- Add 8131048 & 8164920 (PR3574/RH1498936) to provide a CRC32 intrinsic for PPC64.
+
* Thu Jan 24 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-0
- Introduce sa_arches for architectures with sa-jdi.jar and include aarch64
diff --git a/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
new file mode 100644
index 0000000..d7b94e6
--- /dev/null
+++ b/jdk8131048-pr3574-rh1498936-ppc_crc32.patch
@@ -0,0 +1,1417 @@
+# HG changeset patch
+# User gromero
+# Date 1537823918 14400
+# Mon Sep 24 17:18:38 2018 -0400
+# Node ID 567e95df42f866b890dc3f0670e086d266915112
+# Parent 678bb67e02aedd54e32819a9011962326164274e
+8131048, PR3574, RH1498936: ppc implement CRC32 intrinsic
+Reviewed-by: goetz
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/interpreterGenerator_ppc.hpp
+@@ -33,5 +33,7 @@
+ address generate_abstract_entry(void);
+ address generate_accessor_entry(void);
+ address generate_Reference_get_entry(void);
++ address generate_CRC32_update_entry();
++ address generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind kind);
+
+ #endif // CPU_PPC_VM_INTERPRETERGENERATOR_PPC_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -49,6 +49,7 @@
+ #else
+ #define BLOCK_COMMENT(str) block_comment(str)
+ #endif
++#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
+
+ #ifdef ASSERT
+ // On RISC, there's no benefit to verifying instruction boundaries.
+@@ -3022,6 +3023,418 @@
+ bind(Ldone_false);
+ }
+
++// Helpers for Intrinsic Emitters
++//
++// Revert the byte order of a 32bit value in a register
++// src: 0x44556677
++// dst: 0x77665544
++// Three steps to obtain the result:
++// 1) Rotate src (as doubleword) left 5 bytes. That puts the leftmost byte of the src
word
++// into the rightmost byte position. Afterwards, everything left of the rightmost
byte is cleared.
++// This value initializes dst.
++// 2) Rotate src (as word) left 3 bytes. That puts the rightmost byte of the src word
into the leftmost
++// byte position. Furthermore, byte 5 is rotated into byte 6 position where it is
supposed to go.
++// This value is mask inserted into dst with a [0..23] mask of 1s.
++// 3) Rotate src (as word) left 1 byte. That puts byte 6 into byte 5 position.
++// This value is mask inserted into dst with a [8..15] mask of 1s.
++void MacroAssembler::load_reverse_32(Register dst, Register src) {
++ assert_different_registers(dst, src);
++
++ rldicl(dst, src, (4+1)*8, 56); // Rotate byte 4 into position 7 (rightmost),
clear all to the left.
++ rlwimi(dst, src, 3*8, 0, 23); // Insert byte 5 into position 6, 7 into 4, leave
pos 7 alone.
++ rlwimi(dst, src, 1*8, 8, 15); // Insert byte 6 into position 5, leave the rest
alone.
++}
++
++// Calculate the column addresses of the crc32 lookup table into distinct registers.
++// This loop-invariant calculation is moved out of the loop body, reducing the loop
++// body size from 20 to 16 instructions.
++// Returns the offset that was used to calculate the address of column tc3.
++// Due to register shortage, setting tc3 may overwrite table. With the return offset
++// at hand, the original table address can be easily reconstructed.
++int MacroAssembler::crc32_table_columns(Register table, Register tc0, Register tc1,
Register tc2, Register tc3) {
++
++#ifdef VM_LITTLE_ENDIAN
++ // This is what we implement (the DOLIT4 part):
++ // ========================================================================= */
++ // #define DOLIT4 c ^= *buf4++; \
++ // c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^
\
++ // crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
++ // #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
++ // ========================================================================= */
++ const int ix0 = 3*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 2*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 1*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 0*(4*CRC32_COLUMN_SIZE);
++#else
++ // This is what we implement (the DOBIG4 part):
++ // =========================================================================
++ // #define DOBIG4 c ^= *++buf4; \
++ // c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^
\
++ // crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
++ // #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
++ // =========================================================================
++ const int ix0 = 4*(4*CRC32_COLUMN_SIZE);
++ const int ix1 = 5*(4*CRC32_COLUMN_SIZE);
++ const int ix2 = 6*(4*CRC32_COLUMN_SIZE);
++ const int ix3 = 7*(4*CRC32_COLUMN_SIZE);
++#endif
++ assert_different_registers(table, tc0, tc1, tc2);
++ assert(table == tc3, "must be!");
++
++ if (ix0 != 0) addi(tc0, table, ix0);
++ if (ix1 != 0) addi(tc1, table, ix1);
++ if (ix2 != 0) addi(tc2, table, ix2);
++ if (ix3 != 0) addi(tc3, table, ix3);
++
++ return ix3;
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_byte_crc32(Register crc, Register val, Register table,
Register tmp) {
++ assert_different_registers(crc, table, tmp);
++ assert_different_registers(val, table);
++
++ if (crc == val) { // Must rotate first to use the unmodified value.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left
by 2, into byte 6..7 of tmp, clear the rest.
++ // As we use a word (4-byte) instruction, we have
to adapt the mask bit positions.
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ } else {
++ srwi(crc, crc, 8); // Unsigned shift, clear leftmost 8 bits.
++ rlwinm(tmp, val, 2, 24-2, 31-2); // Insert (rightmost) byte 7 of val, shifted left
by 2, into byte 6..7 of tmp, clear the rest.
++ }
++ lwzx(tmp, table, tmp);
++ xorr(crc, crc, tmp);
++}
++
++/**
++ * uint32_t crc;
++ * timesXtoThe32[crc & 0xFF] ^ (crc >> 8);
++ */
++void MacroAssembler::fold_8bit_crc32(Register crc, Register table, Register tmp) {
++ fold_byte_crc32(crc, crc, table, tmp);
++}
++
++/**
++ * Emits code to update CRC-32 with a byte value according to constants in table.
++ *
++ * @param [in,out]crc Register containing the crc.
++ * @param [in]val Register containing the byte to fold into the CRC.
++ * @param [in]table Register containing the table of crc constants.
++ *
++ * uint32_t crc;
++ * val = crc_table[(val ^ crc) & 0xFF];
++ * crc = val ^ (crc >> 8);
++ */
++void MacroAssembler::update_byte_crc32(Register crc, Register val, Register table) {
++ BLOCK_COMMENT("update_byte_crc32:");
++ xorr(val, val, crc);
++ fold_byte_crc32(crc, val, table, val);
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ */
++void MacroAssembler::update_byteLoop_crc32(Register crc, Register buf, Register len,
Register table,
++ Register data, bool loopAlignment, bool
invertCRC) {
++ assert_different_registers(crc, buf, len, table, data);
++
++ Label L_mainLoop, L_done;
++ const int mainLoop_stepping = 1;
++ const int mainLoop_alignment = loopAlignment ? 32 : 4; // (InputForNewCode > 4 ?
InputForNewCode : 32) : 4;
++
++ // Process all bytes in a single-byte loop.
++ cmpdi(CCR0, len, 0); // Anything to do?
++ mtctr(len);
++ beq(CCR0, L_done);
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ align(mainLoop_alignment);
++ BIND(L_mainLoop);
++ lbz(data, 0, buf); // Byte from buffer, zero-extended.
++ addi(buf, buf, mainLoop_stepping); // Advance buffer position.
++ update_byte_crc32(crc, data, table);
++ bdnz(L_mainLoop); // Iterate.
++
++ if (invertCRC) {
++ nand(crc, crc, crc); // ~c
++ }
++
++ bind(L_done);
++}
++
++/**
++ * Emits code to update CRC-32 with a 4-byte value according to constants in table
++ * Implementation according to jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.c
++ */
++// A not on the lookup table address(es):
++// The lookup table consists of two sets of four columns each.
++// The columns {0..3} are used for little-endian machines.
++// The columns {4..7} are used for big-endian machines.
++// To save the effort of adding the column offset to the table address each time
++// a table element is looked up, it is possible to pass the pre-calculated
++// column addresses.
++// Uses R9..R12 as work register. Must be saved/restored by caller, if necessary.
++void MacroAssembler::update_1word_crc32(Register crc, Register buf, Register table, int
bufDisp, int bufInc,
++ Register t0, Register t1, Register t2,
Register t3,
++ Register tc0, Register tc1, Register tc2,
Register tc3) {
++ assert_different_registers(crc, t3);
++
++ // XOR crc with next four bytes of buffer.
++ lwz(t3, bufDisp, buf);
++ if (bufInc != 0) {
++ addi(buf, buf, bufInc);
++ }
++ xorr(t3, t3, crc);
++
++ // Chop crc into 4 single-byte pieces, shifted left 2 bits, to form the table
indices.
++ rlwinm(t0, t3, 2, 24-2, 31-2); // ((t1 >> 0) & 0xff) << 2
++ rlwinm(t1, t3, 32+(2- 8), 24-2, 31-2); // ((t1 >> 8) & 0xff) << 2
++ rlwinm(t2, t3, 32+(2-16), 24-2, 31-2); // ((t1 >> 16) & 0xff) << 2
++ rlwinm(t3, t3, 32+(2-24), 24-2, 31-2); // ((t1 >> 24) & 0xff) << 2
++
++ // Use the pre-calculated column addresses.
++ // Load pre-calculated table values.
++ lwzx(t0, tc0, t0);
++ lwzx(t1, tc1, t1);
++ lwzx(t2, tc2, t2);
++ lwzx(t3, tc3, t3);
++
++ // Calculate new crc from table values.
++ xorr(t0, t0, t1);
++ xorr(t2, t2, t3);
++ xorr(crc, t0, t2); // Now crc contains the final checksum value.
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_2word(Register crc, Register buf, Register len,
Register table,
++ Register t0, Register t1, Register t2,
Register t3,
++ Register tc0, Register tc1, Register tc2,
Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 8;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur
anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_2word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector
instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for
alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into tmp2,
anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop
(>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping
left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop
(>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate
registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // Revert byte order because we are
dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows
2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, 0, crc_rv, t1, t2, t3, tc0, tc1, tc2,
tc3);
++ update_1word_crc32(crc_rv, buf, table, 4, mainLoop_stepping, crc_rv, t1, t2, t3,
tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are
dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register
again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_2word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * uses R9..R12 as work register. Must be saved/restored by caller!
++ */
++void MacroAssembler::kernel_crc32_1word(Register crc, Register buf, Register len,
Register table,
++ Register t0, Register t1, Register t2,
Register t3,
++ Register tc0, Register tc1, Register tc2,
Register tc3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_mainLoop, L_tail;
++ Register tmp = t0;
++ Register data = t0;
++ Register tmp2 = t1;
++ const int mainLoop_stepping = 4;
++ const int tailLoop_stepping = 1;
++ const int log_stepping = exact_log2(mainLoop_stepping);
++ const int mainLoop_alignment = 32; // InputForNewCode > 4 ? InputForNewCode : 32;
++ const int complexThreshold = 2*mainLoop_stepping;
++
++ // Don't test for len <= 0 here. This pathological case should not occur
anyway.
++ // Optimizing for it by adding a test and a branch seems to be a waste of CPU cycles.
++ // The situation itself is detected and handled correctly by the conditional branches
++ // following aghi(len, -stepping) and aghi(len, +stepping).
++ assert(tailLoop_stepping == 1, "check tailLoop_stepping!");
++
++ BLOCK_COMMENT("kernel_crc32_1word {");
++
++ nand(crc, crc, crc); // ~c
++
++ // Check for short (<mainLoop_stepping) buffer.
++ cmpdi(CCR0, len, complexThreshold);
++ blt(CCR0, L_tail);
++
++ // Pre-mainLoop alignment did show a slight (1%) positive effect on performance.
++ // We leave the code in for reference. Maybe we need alignment when we exploit vector
instructions.
++ {
++ // Align buf addr to mainLoop_stepping boundary.
++ neg(tmp2, buf); // Calculate # preLoop iterations for
alignment.
++ rldicl(tmp2, tmp2, 0, 64-log_stepping); // Rotate tmp2 0 bits, insert into
tmp2, anding with mask with 1s from 62..63.
++
++ if (complexThreshold > mainLoop_stepping) {
++ sub(len, len, tmp2); // Remaining bytes for main loop
(>=mainLoop_stepping is guaranteed).
++ } else {
++ sub(tmp, len, tmp2); // Remaining bytes for main loop.
++ cmpdi(CCR0, tmp, mainLoop_stepping);
++ blt(CCR0, L_tail); // For less than one mainloop_stepping
left, do only tail processing
++ mr(len, tmp); // remaining bytes for main loop
(>=mainLoop_stepping is guaranteed).
++ }
++ update_byteLoop_crc32(crc, buf, tmp2, table, data, false, false);
++ }
++
++ srdi(tmp2, len, log_stepping); // #iterations for mainLoop
++ andi(len, len, mainLoop_stepping-1); // remaining bytes for tailLoop
++ mtctr(tmp2);
++
++#ifdef VM_LITTLE_ENDIAN
++ Register crc_rv = crc;
++#else
++ Register crc_rv = tmp; // Load_reverse needs separate
registers to work on.
++ // Occupies tmp, but frees up crc.
++ load_reverse_32(crc_rv, crc); // evert byte order because we are
dealing with big-endian data.
++ tmp = crc;
++#endif
++
++ int reconstructTableOffset = crc32_table_columns(table, tc0, tc1, tc2, tc3);
++
++ align(mainLoop_alignment); // Octoword-aligned loop address. Shows
2% improvement.
++ BIND(L_mainLoop);
++ update_1word_crc32(crc_rv, buf, table, 0, mainLoop_stepping, crc_rv, t1, t2, t3,
tc0, tc1, tc2, tc3);
++ bdnz(L_mainLoop);
++
++#ifndef VM_LITTLE_ENDIAN
++ load_reverse_32(crc, crc_rv); // Revert byte order because we are
dealing with big-endian data.
++ tmp = crc_rv; // Tmp uses it's original register
again.
++#endif
++
++ // Restore original table address for tailLoop.
++ if (reconstructTableOffset != 0) {
++ addi(table, table, -reconstructTableOffset);
++ }
++
++ // Process last few (<complexThreshold) bytes of buffer.
++ BIND(L_tail);
++ update_byteLoop_crc32(crc, buf, len, table, data, false, false);
++
++ nand(crc, crc, crc); // ~c
++ BLOCK_COMMENT("} kernel_crc32_1word");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ *
++ * Uses R7_ARG5, R8_ARG6 as work registers.
++ */
++void MacroAssembler::kernel_crc32_1byte(Register crc, Register buf, Register len,
Register table,
++ Register t0, Register t1, Register t2,
Register t3) {
++ assert_different_registers(crc, buf, len, table);
++
++ Register data = t0; // Holds the current byte to be folded into
crc.
++
++ BLOCK_COMMENT("kernel_crc32_1byte {");
++
++ // Process all bytes in a single-byte loop.
++ update_byteLoop_crc32(crc, buf, len, table, data, true, true);
++
++ BLOCK_COMMENT("} kernel_crc32_1byte");
++}
++
++void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len,
Register table, Register tmp) {
++ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
++
++ BLOCK_COMMENT("kernel_crc32_singleByte:");
++ nand(crc, crc, crc); // ~c
++
++ lbz(tmp, 0, buf); // Byte from buffer, zero-extended.
++ update_byte_crc32(crc, tmp, table);
++
++ nand(crc, crc, crc); // ~c
++}
++
+
+ void MacroAssembler::asm_assert(bool check_equal, const char *msg, int id) {
+ #ifdef ASSERT
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -637,6 +637,27 @@
+ void char_arrays_equalsImm(Register str1_reg, Register str2_reg, int cntval, Register
result_reg,
+ Register tmp1_reg, Register tmp2_reg);
+
++ // CRC32 Intrinsics.
++ void load_reverse_32(Register dst, Register src);
++ int crc32_table_columns(Register table, Register tc0, Register tc1, Register tc2,
Register tc3);
++ void fold_byte_crc32(Register crc, Register val, Register table, Register tmp);
++ void fold_8bit_crc32(Register crc, Register table, Register tmp);
++ void update_byte_crc32(Register crc, Register val, Register table);
++ void update_byteLoop_crc32(Register crc, Register buf, Register len, Register table,
++ Register data, bool loopAlignment, bool invertCRC);
++ void update_1word_crc32(Register crc, Register buf, Register table, int bufDisp, int
bufInc,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_2word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1word(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3,
++ Register tc0, Register tc1, Register tc2, Register tc3);
++ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
++ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table,
Register tmp);
++
+ //
+ // Debugging
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2473,6 +2473,54 @@
+ __ blr();
+ }
+
++ /**
++ * Arguments:
++ *
++ * Inputs:
++ * R3_ARG1 - int crc
++ * R4_ARG2 - byte* buf
++ * R5_ARG3 - int length (of buffer)
++ *
++ * scratch:
++ * R6_ARG4 - crc table address
++ * R7_ARG5 - tmp1
++ * R8_ARG6 - tmp2
++ *
++ * Ouput:
++ * R3_RET - int crc result
++ */
++ // Compute CRC32 function.
++ address generate_CRC32_updateBytes(const char* name) {
++ __ align(CodeEntryAlignment);
++ StubCodeMark mark(this, "StubRoutines", name);
++ address start = __ function_entry(); // Remember stub start address (is rtn
value).
++
++ // arguments to kernel_crc32:
++ Register crc = R3_ARG1; // Current checksum, preset by caller or result
from previous call.
++ Register data = R4_ARG2; // source byte array
++ Register dataLen = R5_ARG3; // #bytes to process
++ Register table = R6_ARG4; // crc table address
++
++ Register t0 = R9; // work reg for kernel* emitters
++ Register t1 = R10; // work reg for kernel* emitters
++ Register t2 = R11; // work reg for kernel* emitters
++ Register t3 = R12; // work reg for kernel* emitters
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying
required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ return start;
++ }
++
+ // Initialization
+ void generate_initial() {
+ // Generates all stubs and initializes the entry points
+@@ -2491,6 +2539,12 @@
+ StubRoutines::_throw_StackOverflowError_entry =
+ generate_throw_exception("StackOverflowError throw_exception",
+ CAST_FROM_FN_PTR(address,
SharedRuntime::throw_StackOverflowError), false);
++
++ // CRC32 Intrinsics.
++ if (UseCRC32Intrinsics) {
++ StubRoutines::_crc_table_adr = (address)StubRoutines::ppc64::_crc_table;
++ StubRoutines::_updateBytesCRC32 =
generate_CRC32_updateBytes("CRC32_updateBytes");
++ }
+ }
+
+ void generate_all() {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2014 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -23,7 +23,457 @@
+ *
+ */
+
++#include "asm/macroAssembler.inline.hpp"
++#include "runtime/stubRoutines.hpp"
++
+ // Implementation of the platform-specific part of StubRoutines - for
+ // a description of how to extend it, see the stubRoutines.hpp file.
+
+
++#define __ masm->
++
++// CRC32 Intrinsics.
++void StubRoutines::ppc64::generate_load_crc_table_addr(MacroAssembler* masm, Register
table) {
++ __ load_const(table, StubRoutines::_crc_table_adr);
++}
++
++// CRC32 Intrinsics.
++/**
++ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
++ */
++juint StubRoutines::ppc64::_crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE] = {
++ {
++ 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
++ 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
++ 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
++ 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
++ 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
++ 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
++ 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
++ 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
++ 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
++ 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
++ 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
++ 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
++ 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
++ 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
++ 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
++ 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
++ 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
++ 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
++ 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
++ 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
++ 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
++ 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
++ 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
++ 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
++ 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
++ 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
++ 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
++ 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
++ 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
++ 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
++ 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
++ 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
++ 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
++ 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
++ 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
++ 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
++ 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
++ 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
++ 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
++ 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
++ 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
++ 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
++ 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
++ 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
++ 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
++ 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
++ 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
++ 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
++ 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
++ 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
++ 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
++ 0x2d02ef8dUL
++#ifdef CRC32_BYFOUR
++ },
++ {
++ 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
++ 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
++ 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
++ 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
++ 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
++ 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
++ 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
++ 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
++ 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
++ 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
++ 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
++ 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
++ 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
++ 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
++ 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
++ 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
++ 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
++ 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
++ 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
++ 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
++ 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
++ 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
++ 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
++ 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
++ 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
++ 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
++ 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
++ 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
++ 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
++ 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
++ 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
++ 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
++ 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
++ 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
++ 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
++ 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
++ 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
++ 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
++ 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
++ 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
++ 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
++ 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
++ 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
++ 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
++ 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
++ 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
++ 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
++ 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
++ 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
++ 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
++ 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
++ 0x9324fd72UL
++ },
++ {
++ 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
++ 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
++ 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
++ 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
++ 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
++ 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
++ 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
++ 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
++ 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
++ 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
++ 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
++ 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
++ 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
++ 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
++ 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
++ 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
++ 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
++ 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
++ 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
++ 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
++ 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
++ 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
++ 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
++ 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
++ 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
++ 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
++ 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
++ 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
++ 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
++ 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
++ 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
++ 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
++ 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
++ 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
++ 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
++ 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
++ 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
++ 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
++ 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
++ 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
++ 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
++ 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
++ 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
++ 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
++ 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
++ 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
++ 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
++ 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
++ 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
++ 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
++ 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
++ 0xbe9834edUL
++ },
++ {
++ 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
++ 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
++ 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
++ 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
++ 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
++ 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
++ 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
++ 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
++ 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
++ 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
++ 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
++ 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
++ 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
++ 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
++ 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
++ 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
++ 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
++ 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
++ 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
++ 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
++ 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
++ 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
++ 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
++ 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
++ 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
++ 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
++ 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
++ 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
++ 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
++ 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
++ 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
++ 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
++ 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
++ 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
++ 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
++ 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
++ 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
++ 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
++ 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
++ 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
++ 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
++ 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
++ 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
++ 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
++ 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
++ 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
++ 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
++ 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
++ 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
++ 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
++ 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
++ 0xde0506f1UL
++ },
++ {
++ 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
++ 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
++ 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
++ 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
++ 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
++ 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
++ 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
++ 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
++ 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
++ 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
++ 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
++ 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
++ 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
++ 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
++ 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
++ 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
++ 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
++ 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
++ 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
++ 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
++ 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
++ 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
++ 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
++ 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
++ 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
++ 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
++ 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
++ 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
++ 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
++ 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
++ 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
++ 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
++ 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
++ 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
++ 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
++ 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
++ 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
++ 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
++ 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
++ 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
++ 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
++ 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
++ 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
++ 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
++ 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
++ 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
++ 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
++ 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
++ 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
++ 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
++ 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
++ 0x8def022dUL
++ },
++ {
++ 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
++ 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
++ 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
++ 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
++ 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
++ 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
++ 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
++ 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
++ 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
++ 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
++ 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
++ 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
++ 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
++ 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
++ 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
++ 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
++ 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
++ 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
++ 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
++ 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
++ 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
++ 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
++ 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
++ 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
++ 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
++ 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
++ 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
++ 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
++ 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
++ 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
++ 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
++ 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
++ 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
++ 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
++ 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
++ 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
++ 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
++ 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
++ 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
++ 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
++ 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
++ 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
++ 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
++ 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
++ 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
++ 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
++ 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
++ 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
++ 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
++ 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
++ 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
++ 0x72fd2493UL
++ },
++ {
++ 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
++ 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
++ 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
++ 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
++ 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
++ 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
++ 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
++ 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
++ 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
++ 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
++ 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
++ 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
++ 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
++ 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
++ 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
++ 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
++ 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
++ 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
++ 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
++ 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
++ 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
++ 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
++ 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
++ 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
++ 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
++ 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
++ 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
++ 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
++ 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
++ 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
++ 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
++ 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
++ 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
++ 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
++ 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
++ 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
++ 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
++ 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
++ 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
++ 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
++ 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
++ 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
++ 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
++ 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
++ 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
++ 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
++ 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
++ 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
++ 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
++ 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
++ 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
++ 0xed3498beUL
++ },
++ {
++ 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
++ 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
++ 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
++ 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
++ 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
++ 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
++ 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
++ 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
++ 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
++ 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
++ 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
++ 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
++ 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
++ 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
++ 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
++ 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
++ 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
++ 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
++ 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
++ 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
++ 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
++ 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
++ 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
++ 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
++ 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
++ 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
++ 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
++ 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
++ 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
++ 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
++ 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
++ 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
++ 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
++ 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
++ 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
++ 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
++ 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
++ 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
++ 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
++ 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
++ 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
++ 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
++ 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
++ 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
++ 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
++ 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
++ 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
++ 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
++ 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
++ 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
++ 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
++ 0xf10605deUL
++#endif
++ }
++};
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -1,6 +1,6 @@
+ /*
+- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2012, 2013 SAP AG. All rights reserved.
++ * Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2012, 2018 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -30,11 +30,35 @@
+ // definition. See stubRoutines.hpp for a description on how to
+ // extend it.
+
+-static bool returns_to_call_stub(address return_pc) { return return_pc ==
_call_stub_return_address; }
++static bool returns_to_call_stub(address return_pc) { return return_pc ==
_call_stub_return_address; }
+
+ enum platform_dependent_constants {
+ code_size1 = 20000, // simply increase if too small (assembler will crash if
too small)
+ code_size2 = 20000 // simply increase if too small (assembler will crash if
too small)
+ };
+
++// CRC32 Intrinsics.
++#define CRC32_COLUMN_SIZE 256
++#define CRC32_BYFOUR
++#ifdef CRC32_BYFOUR
++ #define CRC32_TABLES 8
++#else
++ #define CRC32_TABLES 1
++#endif
++
++class ppc64 {
++ friend class StubGenerator;
++
++ private:
++
++ // CRC32 Intrinsics.
++ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++
++ public:
++
++ // CRC32 Intrinsics.
++ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++
++};
++
+ #endif // CPU_PPC_VM_STUBROUTINES_PPC_64_HPP
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/templateInterpreter_ppc.cpp
+@@ -57,7 +57,7 @@
+ #define BLOCK_COMMENT(str) __ block_comment(str)
+ #endif
+
+-#define BIND(label) bind(label); BLOCK_COMMENT(#label ":")
++#define BIND(label) __ bind(label); BLOCK_COMMENT(#label ":")
+
+ //-----------------------------------------------------------------------------
+
+@@ -783,7 +783,7 @@
+ }
+ generate_counter_incr(&invocation_counter_overflow, NULL, NULL);
+
+- __ BIND(continue_after_compile);
++ BIND(continue_after_compile);
+ // Reset the _do_not_unlock_if_synchronized flag.
+ if (synchronized) {
+ __ li(R0, 0);
+@@ -843,7 +843,7 @@
+ __ ld(signature_handler_fd, method_(signature_handler));
+ __ twi_0(signature_handler_fd); // Order wrt. load of klass mirror and entry point
(isync is below).
+
+- __ BIND(call_signature_handler);
++ BIND(call_signature_handler);
+
+ // Before we call the signature handler we push a new frame to
+ // protect the interpreter frame volatile registers when we return
+@@ -913,7 +913,7 @@
+ __ std(R0/*mirror*/, _ijava_state_neg(oop_tmp), R11_scratch1);
+ // R4_ARG2 = &state->_oop_temp;
+ __ addi(R4_ARG2, R11_scratch1, _ijava_state_neg(oop_tmp));
+- __ BIND(method_is_not_static);
++ BIND(method_is_not_static);
+ }
+
+ // At this point, arguments have been copied off the stack into
+@@ -1126,14 +1126,14 @@
+ // interpreter will do the correct thing. If it isn't interpreted
+ // (call stub/compiled code) we will change our return and continue.
+
+- __ BIND(exception_return_sync_check);
++ BIND(exception_return_sync_check);
+
+ if (synchronized) {
+ // Don't check for exceptions since we're still in the i2n frame. Do that
+ // manually afterwards.
+ unlock_method(false);
+ }
+- __ BIND(exception_return_sync_check_already_unlocked);
++ BIND(exception_return_sync_check_already_unlocked);
+
+ const Register return_pc = R31;
+
+@@ -1327,6 +1327,12 @@
+ case Interpreter::java_lang_math_exp : entry_point = ((InterpreterGenerator*)
this)->generate_math_entry(kind); break;
+ case Interpreter::java_lang_ref_reference_get
+ : entry_point =
((InterpreterGenerator*)this)->generate_Reference_get_entry(); break;
++ case Interpreter::java_util_zip_CRC32_update
++ : entry_point =
((InterpreterGenerator*)this)->generate_CRC32_update_entry(); break;
++ case Interpreter::java_util_zip_CRC32_updateBytes
++ : // fall thru
++ case Interpreter::java_util_zip_CRC32_updateByteBuffer
++ : entry_point =
((InterpreterGenerator*)this)->generate_CRC32_updateBytes_entry(kind); break;
+ default : ShouldNotReachHere();
break;
+ }
+
+@@ -1337,6 +1343,179 @@
+ return ((InterpreterGenerator*) this)->generate_normal_entry(synchronized);
+ }
+
++// CRC32 Intrinsics.
++//
++// Contract on scratch and work registers.
++// =======================================
++//
++// On ppc, the register set {R2..R12} is available in the interpreter as scratch/work
registers.
++// You should, however, keep in mind that {R3_ARG1..R10_ARG8} is the C-ABI argument
register set.
++// You can't rely on these registers across calls.
++//
++// The generators for CRC32_update and for CRC32_updateBytes use the
++// scratch/work register set internally, passing the work registers
++// as arguments to the MacroAssembler emitters as required.
++//
++// R3_ARG1..R6_ARG4 are preset to hold the incoming java arguments.
++// Their contents is not constant but may change according to the requirements
++// of the emitted code.
++//
++// All other registers from the scratch/work register set are used
"internally"
++// and contain garbage (i.e. unpredictable values) once blr() is reached.
++// Basically, only R3_RET contains a defined value which is the function result.
++//
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.update(int crc, int b)
++ */
++address InterpreterGenerator::generate_CRC32_update_entry() {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state,
SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load java parameters.
++ // R15_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte value (kernel_crc32 needs
address)
++ const Register dataLen = R5_ARG3; // source data len (1 byte). Not used because
calling the single-byte emitter.
++ const Register table = R6_ARG4; // address of crc32 table
++ const Register tmp = dataLen; // Reuse unused len register to show we don't
actually need a separate tmp here.
++
++ BLOCK_COMMENT("CRC32_update {");
++
++ // Arguments are reversed on java expression stack
++#ifdef VM_LITTLE_ENDIAN
++ __ addi(data, argP, 0+1*wordSize); // (stack) address of byte value. Emitter expects
address, not value.
++ // Being passed as an int, the single byte is at
offset +0.
++#else
++ __ addi(data, argP, 3+1*wordSize); // (stack) address of byte value. Emitter expects
address, not value.
++ // Being passed from java as an int, the single
byte is at offset +3.
++#endif
++ __ lwz(crc, 2*wordSize, argP); // Current crc state, zero extend to 64 bit to
have a clean register.
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ __ kernel_crc32_singleByte(crc, data, dataLen, table, tmp);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_update");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
++// CRC32 Intrinsics.
++/**
++ * Method entry for static native methods:
++ * int java.util.zip.CRC32.updateBytes( int crc, byte[] b, int off, int len)
++ * int java.util.zip.CRC32.updateByteBuffer(int crc, long* buf, int off, int len)
++ */
++address
InterpreterGenerator::generate_CRC32_updateBytes_entry(AbstractInterpreter::MethodKind
kind) {
++ address start = __ pc(); // Remember stub start address (is rtn value).
++
++ if (UseCRC32Intrinsics) {
++ Label slow_path;
++
++ // Safepoint check
++ const Register sync_state = R11_scratch1;
++ int sync_state_offs = __ load_const_optimized(sync_state,
SafepointSynchronize::address_of_state(), /*temp*/R0, true);
++ __ lwz(sync_state, sync_state_offs, sync_state);
++ __ cmpwi(CCR0, sync_state, SafepointSynchronize::_not_synchronized);
++ __ bne(CCR0, slow_path);
++
++ // We don't generate local frame and don't align stack because
++ // we not even call stub code (we generate the code inline)
++ // and there is no safepoint on this path.
++
++ // Load parameters.
++ // Z_esp is callers operand stack pointer, i.e. it points to the parameters.
++ const Register argP = R15_esp;
++ const Register crc = R3_ARG1; // crc value
++ const Register data = R4_ARG2; // address of java byte array
++ const Register dataLen = R5_ARG3; // source data len
++ const Register table = R6_ARG4; // address of crc32 table
++
++ const Register t0 = R9; // scratch registers for crc calculation
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++
++ const Register tc0 = R2; // registers to hold pre-calculated column
addresses
++ const Register tc1 = R7;
++ const Register tc2 = R8;
++ const Register tc3 = table; // table address is reconstructed at the end of
kernel_crc32_* emitters
++
++ const Register tmp = t0; // Only used very locally to calculate byte
buffer address.
++
++ // Arguments are reversed on java expression stack.
++ // Calculate address of start element.
++ if (kind == Interpreter::java_util_zip_CRC32_updateByteBuffer) { // Used for
"updateByteBuffer direct".
++ BLOCK_COMMENT("CRC32_updateByteBuffer {");
++ // crc @ (SP + 5W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to long array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ lwz( crc, 5*wordSize, argP); // current crc state
++ __ add( data, data, tmp); // Add byte buffer offset.
++ } else { // Used for
"updateBytes update".
++ BLOCK_COMMENT("CRC32_updateBytes {");
++ // crc @ (SP + 4W) (32bit)
++ // buf @ (SP + 3W) (64bit ptr to byte array)
++ // off @ (SP + 2W) (32bit)
++ // dataLen @ (SP + 1W) (32bit)
++ // data = buf + off + base_offset
++ __ ld( data, 3*wordSize, argP); // start of byte buffer
++ __ lwa( tmp, 2*wordSize, argP); // byte buffer offset
++ __ lwa( dataLen, 1*wordSize, argP); // #bytes to process
++ __ add( data, data, tmp); // add byte buffer offset
++ __ lwz( crc, 4*wordSize, argP); // current crc state
++ __ addi(data, data, arrayOopDesc::base_offset_in_bytes(T_BYTE));
++ }
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ // Performance measurements show the 1word and 2word variants to be almost
equivalent,
++ // with very light advantages for the 1word variant. We chose the 1word variant for
++ // code compactness.
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2,
tc3);
++
++ // Restore caller sp for c2i case and return.
++ __ mr(R1_SP, R21_sender_SP); // Cut the stack back to where the caller started.
++ __ blr();
++
++ // Generate a vanilla native entry as the slow path.
++ BLOCK_COMMENT("} CRC32_updateBytes(Buffer)");
++ BIND(slow_path);
++ }
++
++ (void) generate_native_entry(false);
++
++ return start;
++}
++
+ // These should never be compiled since the interpreter will prefer
+ // the compiled version to the intrinsic version.
+ bool AbstractInterpreter::can_be_compiled(methodHandle m) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -150,10 +150,12 @@
+
+ assert(AllocatePrefetchStyle >= 0, "AllocatePrefetchStyle should be
positive");
+
+- if (UseCRC32Intrinsics) {
+- if (!FLAG_IS_DEFAULT(UseCRC32Intrinsics))
+- warning("CRC32 intrinsics are not available on this CPU");
+- FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
++ // Implementation does not use any of the vector instructions
++ // available with Power8. Their exploitation is still pending.
++ if (!UseCRC32Intrinsics) {
++ if (FLAG_IS_DEFAULT(UseCRC32Intrinsics)) {
++ FLAG_SET_DEFAULT(UseCRC32Intrinsics, true);
++ }
+ }
+
+ // The AES intrinsic stubs require AES instruction support.
+diff --git openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp
openjdk/hotspot/src/share/vm/opto/library_call.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/library_call.cpp
++++ openjdk/hotspot/src/share/vm/opto/library_call.cpp
+@@ -6225,10 +6225,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP,
OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+@@ -6257,10 +6263,16 @@
+ // Call the stub.
+ address stubAddr = StubRoutines::updateBytesCRC32();
+ const char *stubName = "updateBytesCRC32";
+-
+- Node* call = make_runtime_call(RC_LEAF|RC_NO_FP,
OptoRuntime::updateBytesCRC32_Type(),
+- stubAddr, stubName, TypePtr::BOTTOM,
+- crc, src_start, length);
++ Node* call;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc XTOP, src_start, length XTOP);
++ } else {
++ call = make_runtime_call(RC_LEAF|RC_NO_FP, OptoRuntime::updateBytesCRC32_Type(),
++ stubAddr, stubName, TypePtr::BOTTOM,
++ crc, src_start, length);
++ }
+ Node* result = _gvn.transform(new (C) ProjNode(call, TypeFunc::Parms));
+ set_result(result);
+ return true;
+diff --git openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp
openjdk/hotspot/src/share/vm/opto/runtime.cpp
+--- openjdk.orig/hotspot/src/share/vm/opto/runtime.cpp
++++ openjdk/hotspot/src/share/vm/opto/runtime.cpp
+@@ -848,13 +848,24 @@
+ */
+ const TypeFunc* OptoRuntime::updateBytesCRC32_Type() {
+ // create input type (domain)
+- int num_args = 3;
++ int num_args = 3;
+ int argcnt = num_args;
++ if (CCallingConventionRequiresIntsAsLongs) {
++ argcnt += 2;
++ }
+ const Type** fields = TypeTuple::fields(argcnt);
+ int argp = TypeFunc::Parms;
+- fields[argp++] = TypeInt::INT; // crc
+- fields[argp++] = TypePtr::NOTNULL; // src
+- fields[argp++] = TypeInt::INT; // len
++ if (CCallingConventionRequiresIntsAsLongs) {
++ fields[argp++] = TypeLong::LONG; // crc
++ fields[argp++] = Type::HALF;
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeLong::LONG; // len
++ fields[argp++] = Type::HALF;
++ } else {
++ fields[argp++] = TypeInt::INT; // crc
++ fields[argp++] = TypePtr::NOTNULL; // src
++ fields[argp++] = TypeInt::INT; // len
++ }
+ assert(argp == TypeFunc::Parms+argcnt, "correct decoding");
+ const TypeTuple* domain = TypeTuple::make(TypeFunc::Parms+argcnt, fields);
+
diff --git a/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
new file mode 100644
index 0000000..27a2ed4
--- /dev/null
+++ b/jdk8164920-pr3574-rh1498936-ppc_crc32_enhancement.patch
@@ -0,0 +1,1152 @@
+# HG changeset patch
+# User mdoerr
+# Date 1474539444 -7200
+# Thu Sep 22 12:17:24 2016 +0200
+# Node ID de4f1f9fbcc5b7b30e1a796b7cf88a16943e785f
+# Parent 567e95df42f866b890dc3f0670e086d266915112
+8164920, PR3574, RH1498936: ppc: enhancement of CRC32 intrinsic
+Reviewed-by: goetz, mdoerr
+Contributed-by: Hiroshi H Horii <horii(a)jp.ibm.com>
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.hpp
+@@ -468,6 +468,10 @@
+ LVSL_OPCODE = (31u << OPCODE_SHIFT | 6u << 1),
+ LVSR_OPCODE = (31u << OPCODE_SHIFT | 38u << 1),
+
++ // Vector-Scalar (VSX) instruction support.
++ MTVSRD_OPCODE = (31u << OPCODE_SHIFT | 179u << 1),
++ MFVSRD_OPCODE = (31u << OPCODE_SHIFT | 51u << 1),
++
+ // Vector Permute and Formatting
+ VPKPX_OPCODE = (4u << OPCODE_SHIFT | 782u ),
+ VPKSHSS_OPCODE = (4u << OPCODE_SHIFT | 398u ),
+@@ -1938,6 +1942,10 @@
+ inline void mtvscr( VectorRegister b);
+ inline void mfvscr( VectorRegister d);
+
++ // Vector-Scalar (VSX) instructions.
++ inline void mtvrd( VectorRegister d, Register a);
++ inline void mfvrd( Register a, VectorRegister d);
++
+ // AES (introduced with Power 8)
+ inline void vcipher( VectorRegister d, VectorRegister a, VectorRegister b);
+ inline void vcipherlast( VectorRegister d, VectorRegister a, VectorRegister b);
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/assembler_ppc.inline.hpp
+@@ -623,6 +623,10 @@
+ inline void Assembler::lvsl( VectorRegister d, Register s1, Register s2) { emit_int32(
LVSL_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+ inline void Assembler::lvsr( VectorRegister d, Register s1, Register s2) { emit_int32(
LVSR_OPCODE | vrt(d) | ra0mem(s1) | rb(s2)); }
+
++// Vector-Scalar (VSX) instructions.
++inline void Assembler::mtvrd( VectorRegister d, Register a) {
emit_int32( MTVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector
(VMX/Altivec).
++inline void Assembler::mfvrd( Register a, VectorRegister d) {
emit_int32( MFVSRD_OPCODE | vrt(d) | ra(a) | 1u); } // 1u: d is treated as Vector
(VMX/Altivec).
++
+ inline void Assembler::vpkpx( VectorRegister d, VectorRegister a, VectorRegister b) {
emit_int32( VPKPX_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkshss( VectorRegister d, VectorRegister a, VectorRegister b) {
emit_int32( VPKSHSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+ inline void Assembler::vpkswss( VectorRegister d, VectorRegister a, VectorRegister b) {
emit_int32( VPKSWSS_OPCODE | vrt(d) | vra(a) | vrb(b)); }
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.cpp
+@@ -3423,6 +3423,565 @@
+ BLOCK_COMMENT("} kernel_crc32_1byte");
+ }
+
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param table register pointing to CRC table
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ * @param t3 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register
len, Register table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register
t4) {
++ assert_different_registers(crc, buf, len, table);
++
++ Label L_alignedHead, L_tail, L_alignTail, L_start, L_end;
++
++ Register prealign = t0;
++ Register postalign = t0;
++
++ BLOCK_COMMENT("kernel_crc32_1word_vpmsumb {");
++
++ // 1. use kernel_crc32_1word for shorter than 384bit
++ clrldi(len, len, 32);
++ cmpdi(CCR0, len, 384);
++ bge(CCR0, L_start);
++
++ Register tc0 = t4;
++ Register tc1 = constants;
++ Register tc2 = barretConstants;
++ kernel_crc32_1word(crc, buf, len, table,t0, t1, t2, t3, tc0, tc1, tc2, table);
++ b(L_end);
++
++ BIND(L_start);
++
++ // 2. ~c
++ nand(crc, crc, crc);
++
++ // 3. calculate from 0 to first 128bit-aligned address
++ clrldi_(prealign, buf, 57);
++ beq(CCR0, L_alignedHead);
++
++ subfic(prealign, prealign, 128);
++
++ subf(len, prealign, len);
++ update_byteLoop_crc32(crc, buf, prealign, table, t2, false, false);
++
++ // 4. calculate from first 128bit-aligned address to last 128bit-aligned address
++ BIND(L_alignedHead);
++
++ clrldi(postalign, len, 57);
++ subf(len, postalign, len);
++
++ // len must be more than 256bit
++ kernel_crc32_1word_aligned(crc, buf, len, constants, barretConstants, t1, t2, t3);
++
++ // 5. calculate remaining
++ cmpdi(CCR0, postalign, 0);
++ beq(CCR0, L_tail);
++
++ update_byteLoop_crc32(crc, buf, postalign, table, t2, false, false);
++
++ BIND(L_tail);
++
++ // 6. ~c
++ nand(crc, crc, crc);
++
++ BIND(L_end);
++
++ BLOCK_COMMENT("} kernel_crc32_1word_vpmsumb");
++}
++
++/**
++ * @param crc register containing existing CRC (32-bit)
++ * @param buf register pointing to input byte buffer (byte*)
++ * @param len register containing number of bytes
++ * @param constants register pointing to CRC table for 128-bit aligned memory
++ * @param barretConstants register pointing to table for barrett reduction
++ * @param t0 volatile register
++ * @param t1 volatile register
++ * @param t2 volatile register
++ */
++void MacroAssembler::kernel_crc32_1word_aligned(Register crc, Register buf, Register
len,
++ Register constants, Register barretConstants, Register t0, Register t1, Register t2)
{
++ Label L_mainLoop, L_tail, L_alignTail, L_barrett_reduction, L_end,
L_first_warm_up_done, L_first_cool_down, L_second_cool_down, L_XOR, L_test;
++ Label L_lv0, L_lv1, L_lv2, L_lv3, L_lv4, L_lv5, L_lv6, L_lv7, L_lv8, L_lv9, L_lv10,
L_lv11, L_lv12, L_lv13, L_lv14, L_lv15;
++ Label L_1, L_2, L_3, L_4;
++
++ Register rLoaded = t0;
++ Register rTmp1 = t1;
++ Register rTmp2 = t2;
++ Register off16 = R22;
++ Register off32 = R23;
++ Register off48 = R24;
++ Register off64 = R25;
++ Register off80 = R26;
++ Register off96 = R27;
++ Register off112 = R28;
++ Register rIdx = R29;
++ Register rMax = R30;
++ Register constantsPos = R31;
++
++ VectorRegister mask_32bit = VR24;
++ VectorRegister mask_64bit = VR25;
++ VectorRegister zeroes = VR26;
++ VectorRegister const1 = VR27;
++ VectorRegister const2 = VR28;
++
++ // Save non-volatile vector registers (frameless).
++ Register offset = t1; int offsetInt = 0;
++ offsetInt -= 16; li(offset, -16); stvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); stvx(VR28, offset, R1_SP);
++ offsetInt -= 8; std(R22, offsetInt, R1_SP);
++ offsetInt -= 8; std(R23, offsetInt, R1_SP);
++ offsetInt -= 8; std(R24, offsetInt, R1_SP);
++ offsetInt -= 8; std(R25, offsetInt, R1_SP);
++ offsetInt -= 8; std(R26, offsetInt, R1_SP);
++ offsetInt -= 8; std(R27, offsetInt, R1_SP);
++ offsetInt -= 8; std(R28, offsetInt, R1_SP);
++ offsetInt -= 8; std(R29, offsetInt, R1_SP);
++ offsetInt -= 8; std(R30, offsetInt, R1_SP);
++ offsetInt -= 8; std(R31, offsetInt, R1_SP);
++
++ // Set constants
++ li(off16, 16);
++ li(off32, 32);
++ li(off48, 48);
++ li(off64, 64);
++ li(off80, 80);
++ li(off96, 96);
++ li(off112, 112);
++
++ clrldi(crc, crc, 32);
++
++ vxor(zeroes, zeroes, zeroes);
++ vspltisw(VR0, -1);
++
++ vsldoi(mask_32bit, zeroes, VR0, 4);
++ vsldoi(mask_64bit, zeroes, VR0, -8);
++
++ // Get the initial value into v8
++ vxor(VR8, VR8, VR8);
++ mtvrd(VR8, crc);
++ vsldoi(VR8, zeroes, VR8, -8); // shift into bottom 32 bits
++
++ li (rLoaded, 0);
++
++ rldicr(rIdx, len, 0, 56);
++
++ {
++ BIND(L_1);
++ // Checksum in blocks of MAX_SIZE (32768)
++ lis(rMax, 0);
++ ori(rMax, rMax, 32768);
++ mr(rTmp2, rMax);
++ cmpd(CCR0, rIdx, rMax);
++ bgt(CCR0, L_2);
++ mr(rMax, rIdx);
++
++ BIND(L_2);
++ subf(rIdx, rMax, rIdx);
++
++ // our main loop does 128 bytes at a time
++ srdi(rMax, rMax, 7);
++
++ /*
++ * Work out the offset into the constants table to start at. Each
++ * constant is 16 bytes, and it is used against 128 bytes of input
++ * data - 128 / 16 = 8
++ */
++ sldi(rTmp1, rMax, 4);
++ srdi(rTmp2, rTmp2, 3);
++ subf(rTmp1, rTmp1, rTmp2);
++
++ // We reduce our final 128 bytes in a separate step
++ addi(rMax, rMax, -1);
++ mtctr(rMax);
++
++ // Find the start of our constants
++ add(constantsPos, constants, rTmp1);
++
++ // zero VR0-v7 which will contain our checksums
++ vxor(VR0, VR0, VR0);
++ vxor(VR1, VR1, VR1);
++ vxor(VR2, VR2, VR2);
++ vxor(VR3, VR3, VR3);
++ vxor(VR4, VR4, VR4);
++ vxor(VR5, VR5, VR5);
++ vxor(VR6, VR6, VR6);
++ vxor(VR7, VR7, VR7);
++
++ lvx(const1, constantsPos);
++
++ /*
++ * If we are looping back to consume more data we use the values
++ * already in VR16-v23.
++ */
++ cmpdi(CCR0, rLoaded, 1);
++ beq(CCR0, L_3);
++ {
++
++ // First warm up pass
++ lvx(VR16, buf);
++ lvx(VR17, off16, buf);
++ lvx(VR18, off32, buf);
++ lvx(VR19, off48, buf);
++ lvx(VR20, off64, buf);
++ lvx(VR21, off80, buf);
++ lvx(VR22, off96, buf);
++ lvx(VR23, off112, buf);
++ addi(buf, buf, 8*16);
++
++ // xor in initial value
++ vxor(VR16, VR16, VR8);
++ }
++
++ BIND(L_3);
++ bdz(L_first_warm_up_done);
++
++ addi(constantsPos, constantsPos, 16);
++ lvx(const2, constantsPos);
++
++ // Second warm up pass
++ vpmsumd(VR8, VR16, const1);
++ lvx(VR16, buf);
++
++ vpmsumd(VR9, VR17, const1);
++ lvx(VR17, off16, buf);
++
++ vpmsumd(VR10, VR18, const1);
++ lvx(VR18, off32, buf);
++
++ vpmsumd(VR11, VR19, const1);
++ lvx(VR19, off48, buf);
++
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdz(L_first_cool_down);
++
++ /*
++ * main loop. We modulo schedule it such that it takes three iterations
++ * to complete - first iteration load, second iteration vpmsum, third
++ * iteration xor.
++ */
++ {
++ BIND(L_4);
++ lvx(const1, constantsPos); addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const2);
++ lvx(VR16, buf);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const2);
++ lvx(VR17, off16, buf);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const2);
++ lvx(VR18, off32, buf);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const2);
++ lvx(VR19, off48, buf);
++ lvx(const2, constantsPos);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++ lvx(VR20, off64, buf);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++ lvx(VR21, off80, buf);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++ lvx(VR22, off96, buf);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++ lvx(VR23, off112, buf);
++
++ addi(buf, buf, 8 * 16);
++
++ bdnz(L_4);
++ }
++
++ BIND(L_first_cool_down);
++
++ // First cool down pass
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++
++ vxor(VR0, VR0, VR8);
++ vpmsumd(VR8, VR16, const1);
++
++ vxor(VR1, VR1, VR9);
++ vpmsumd(VR9, VR17, const1);
++
++ vxor(VR2, VR2, VR10);
++ vpmsumd(VR10, VR18, const1);
++
++ vxor(VR3, VR3, VR11);
++ vpmsumd(VR11, VR19, const1);
++
++ vxor(VR4, VR4, VR12);
++ vpmsumd(VR12, VR20, const1);
++
++ vxor(VR5, VR5, VR13);
++ vpmsumd(VR13, VR21, const1);
++
++ vxor(VR6, VR6, VR14);
++ vpmsumd(VR14, VR22, const1);
++
++ vxor(VR7, VR7, VR15);
++ vpmsumd(VR15, VR23, const1);
++
++ BIND(L_second_cool_down);
++ // Second cool down pass
++ vxor(VR0, VR0, VR8);
++ vxor(VR1, VR1, VR9);
++ vxor(VR2, VR2, VR10);
++ vxor(VR3, VR3, VR11);
++ vxor(VR4, VR4, VR12);
++ vxor(VR5, VR5, VR13);
++ vxor(VR6, VR6, VR14);
++ vxor(VR7, VR7, VR15);
++
++ /*
++ * vpmsumd produces a 96 bit result in the least significant bits
++ * of the register. Since we are bit reflected we have to shift it
++ * left 32 bits so it occupies the least significant bits in the
++ * bit reflected domain.
++ */
++ vsldoi(VR0, VR0, zeroes, 4);
++ vsldoi(VR1, VR1, zeroes, 4);
++ vsldoi(VR2, VR2, zeroes, 4);
++ vsldoi(VR3, VR3, zeroes, 4);
++ vsldoi(VR4, VR4, zeroes, 4);
++ vsldoi(VR5, VR5, zeroes, 4);
++ vsldoi(VR6, VR6, zeroes, 4);
++ vsldoi(VR7, VR7, zeroes, 4);
++
++ // xor with last 1024 bits
++ lvx(VR8, buf);
++ lvx(VR9, off16, buf);
++ lvx(VR10, off32, buf);
++ lvx(VR11, off48, buf);
++ lvx(VR12, off64, buf);
++ lvx(VR13, off80, buf);
++ lvx(VR14, off96, buf);
++ lvx(VR15, off112, buf);
++ addi(buf, buf, 8 * 16);
++
++ vxor(VR16, VR0, VR8);
++ vxor(VR17, VR1, VR9);
++ vxor(VR18, VR2, VR10);
++ vxor(VR19, VR3, VR11);
++ vxor(VR20, VR4, VR12);
++ vxor(VR21, VR5, VR13);
++ vxor(VR22, VR6, VR14);
++ vxor(VR23, VR7, VR15);
++
++ li(rLoaded, 1);
++ cmpdi(CCR0, rIdx, 0);
++ addi(rIdx, rIdx, 128);
++ bne(CCR0, L_1);
++ }
++
++ // Work out how many bytes we have left
++ andi_(len, len, 127);
++
++ // Calculate where in the constant table we need to start
++ subfic(rTmp1, len, 128);
++ add(constantsPos, constantsPos, rTmp1);
++
++ // How many 16 byte chunks are in the tail
++ srdi(rIdx, len, 4);
++ mtctr(rIdx);
++
++ /*
++ * Reduce the previously calculated 1024 bits to 64 bits, shifting
++ * 32 bits to include the trailing 32 bits of zeros
++ */
++ lvx(VR0, constantsPos);
++ lvx(VR1, off16, constantsPos);
++ lvx(VR2, off32, constantsPos);
++ lvx(VR3, off48, constantsPos);
++ lvx(VR4, off64, constantsPos);
++ lvx(VR5, off80, constantsPos);
++ lvx(VR6, off96, constantsPos);
++ lvx(VR7, off112, constantsPos);
++ addi(constantsPos, constantsPos, 8 * 16);
++
++ vpmsumw(VR0, VR16, VR0);
++ vpmsumw(VR1, VR17, VR1);
++ vpmsumw(VR2, VR18, VR2);
++ vpmsumw(VR3, VR19, VR3);
++ vpmsumw(VR4, VR20, VR4);
++ vpmsumw(VR5, VR21, VR5);
++ vpmsumw(VR6, VR22, VR6);
++ vpmsumw(VR7, VR23, VR7);
++
++ // Now reduce the tail (0 - 112 bytes)
++ cmpdi(CCR0, rIdx, 0);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off16, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off32, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off48,constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off64, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off80, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++ beq(CCR0, L_XOR);
++
++ lvx(VR16, buf); addi(buf, buf, 16);
++ lvx(VR17, off96, constantsPos);
++ vpmsumw(VR16, VR16, VR17);
++ vxor(VR0, VR0, VR16);
++
++ // Now xor all the parallel chunks together
++ BIND(L_XOR);
++ vxor(VR0, VR0, VR1);
++ vxor(VR2, VR2, VR3);
++ vxor(VR4, VR4, VR5);
++ vxor(VR6, VR6, VR7);
++
++ vxor(VR0, VR0, VR2);
++ vxor(VR4, VR4, VR6);
++
++ vxor(VR0, VR0, VR4);
++
++ b(L_barrett_reduction);
++
++ BIND(L_first_warm_up_done);
++ lvx(const1, constantsPos);
++ addi(constantsPos, constantsPos, 16);
++ vpmsumd(VR8, VR16, const1);
++ vpmsumd(VR9, VR17, const1);
++ vpmsumd(VR10, VR18, const1);
++ vpmsumd(VR11, VR19, const1);
++ vpmsumd(VR12, VR20, const1);
++ vpmsumd(VR13, VR21, const1);
++ vpmsumd(VR14, VR22, const1);
++ vpmsumd(VR15, VR23, const1);
++ b(L_second_cool_down);
++
++ BIND(L_barrett_reduction);
++
++ lvx(const1, barretConstants);
++ addi(barretConstants, barretConstants, 16);
++ lvx(const2, barretConstants);
++
++ vsldoi(VR1, VR0, VR0, -8);
++ vxor(VR0, VR0, VR1); // xor two 64 bit results together
++
++ // shift left one bit
++ vspltisb(VR1, 1);
++ vsl(VR0, VR0, VR1);
++
++ vand(VR0, VR0, mask_64bit);
++
++ /*
++ * The reflected version of Barrett reduction. Instead of bit
++ * reflecting our data (which is expensive to do), we bit reflect our
++ * constants and our algorithm, which means the intermediate data in
++ * our vector registers goes from 0-63 instead of 63-0. We can reflect
++ * the algorithm because we don't carry in mod 2 arithmetic.
++ */
++ vand(VR1, VR0, mask_32bit); // bottom 32 bits of a
++ vpmsumd(VR1, VR1, const1); // ma
++ vand(VR1, VR1, mask_32bit); // bottom 32bits of ma
++ vpmsumd(VR1, VR1, const2); // qn */
++ vxor(VR0, VR0, VR1); // a - qn, subtraction is xor in GF(2)
++
++ /*
++ * Since we are bit reflected, the result (ie the low 32 bits) is in
++ * the high 32 bits. We just need to shift it left 4 bytes
++ * V0 [ 0 1 X 3 ]
++ * V0 [ 0 X 2 3 ]
++ */
++ vsldoi(VR0, VR0, zeroes, 4); // shift result into top 64 bits of
++
++ // Get it into r3
++ mfvrd(crc, VR0);
++
++ BIND(L_end);
++
++ offsetInt = 0;
++ // Restore non-volatile Vector registers (frameless).
++ offsetInt -= 16; li(offset, -16); lvx(VR20, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR21, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR22, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR23, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR24, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR25, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR26, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR27, offset, R1_SP);
++ offsetInt -= 16; addi(offset, offset, -16); lvx(VR28, offset, R1_SP);
++ offsetInt -= 8; ld(R22, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R23, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R24, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R25, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R26, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R27, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R28, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R29, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R30, offsetInt, R1_SP);
++ offsetInt -= 8; ld(R31, offsetInt, R1_SP);
++}
++
+ void MacroAssembler::kernel_crc32_singleByte(Register crc, Register buf, Register len,
Register table, Register tmp) {
+ assert_different_registers(crc, buf, /* len, not used!! */ table, tmp);
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/macroAssembler_ppc.hpp
+@@ -656,6 +656,13 @@
+ Register tc0, Register tc1, Register tc2, Register tc3);
+ void kernel_crc32_1byte(Register crc, Register buf, Register len, Register table,
+ Register t0, Register t1, Register t2, Register t3);
++ void kernel_crc32_1word_vpmsumd(Register crc, Register buf, Register len, Register
table,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2, Register t3, Register
t4);
++ void kernel_crc32_1word_aligned(Register crc, Register buf, Register len,
++ Register constants, Register barretConstants,
++ Register t0, Register t1, Register t2);
++
+ void kernel_crc32_singleByte(Register crc, Register buf, Register len, Register table,
Register tmp);
+
+ //
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubGenerator_ppc.cpp
+@@ -2482,9 +2482,7 @@
+ * R5_ARG3 - int length (of buffer)
+ *
+ * scratch:
+- * R6_ARG4 - crc table address
+- * R7_ARG5 - tmp1
+- * R8_ARG6 - tmp2
++ * R2, R6-R12
+ *
+ * Ouput:
+ * R3_RET - int crc result
+@@ -2496,28 +2494,62 @@
+ address start = __ function_entry(); // Remember stub start address (is rtn
value).
+
+ // arguments to kernel_crc32:
+- Register crc = R3_ARG1; // Current checksum, preset by caller or result
from previous call.
+- Register data = R4_ARG2; // source byte array
+- Register dataLen = R5_ARG3; // #bytes to process
+- Register table = R6_ARG4; // crc table address
+-
+- Register t0 = R9; // work reg for kernel* emitters
+- Register t1 = R10; // work reg for kernel* emitters
+- Register t2 = R11; // work reg for kernel* emitters
+- Register t3 = R12; // work reg for kernel* emitters
+-
+- BLOCK_COMMENT("Stub body {");
+- assert_different_registers(crc, data, dataLen, table);
+-
+- StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
+-
+- __ kernel_crc32_1byte(crc, data, dataLen, table, t0, t1, t2, t3);
+-
+- BLOCK_COMMENT("return");
+- __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying
required (R3_ARG1 == R3_RET).
+- __ blr();
+-
+- BLOCK_COMMENT("} Stub body");
++ const Register crc = R3_ARG1; // Current checksum, preset by caller or result
from previous call.
++ const Register data = R4_ARG2; // source byte array
++ const Register dataLen = R5_ARG3; // #bytes to process
++
++ const Register table = R6; // crc table address
++
++#ifdef VM_LITTLE_ENDIAN
++ if (VM_Version::has_vpmsumb()) {
++ const Register constants = R2; // constants address
++ const Register bconstants = R8; // barret table address
++
++ const Register t0 = R9;
++ const Register t1 = R10;
++ const Register t2 = R11;
++ const Register t3 = R12;
++ const Register t4 = R7;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++ StubRoutines::ppc64::generate_load_crc_constants_addr(_masm, constants);
++ StubRoutines::ppc64::generate_load_crc_barret_constants_addr(_masm, bconstants);
++
++ __ kernel_crc32_1word_vpmsumd(crc, data, dataLen, table, constants, bconstants,
t0, t1, t2, t3, t4);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying
required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ } else
++#endif
++ {
++ const Register t0 = R2;
++ const Register t1 = R7;
++ const Register t2 = R8;
++ const Register t3 = R9;
++ const Register tc0 = R10;
++ const Register tc1 = R11;
++ const Register tc2 = R12;
++
++ BLOCK_COMMENT("Stub body {");
++ assert_different_registers(crc, data, dataLen, table);
++
++ StubRoutines::ppc64::generate_load_crc_table_addr(_masm, table);
++
++ __ kernel_crc32_1word(crc, data, dataLen, table, t0, t1, t2, t3, tc0, tc1, tc2,
table);
++
++ BLOCK_COMMENT("return");
++ __ mr_if_needed(R3_RET, crc); // Updated crc is function result. No copying
required (R3_ARG1 == R3_RET).
++ __ blr();
++
++ BLOCK_COMMENT("} Stub body");
++ }
++
+ return start;
+ }
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.cpp
+@@ -37,6 +37,311 @@
+ __ load_const(table, StubRoutines::_crc_table_adr);
+ }
+
++void StubRoutines::ppc64::generate_load_crc_constants_addr(MacroAssembler* masm,
Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_constants, R0);
++}
++
++void StubRoutines::ppc64::generate_load_crc_barret_constants_addr(MacroAssembler* masm,
Register table) {
++ __ load_const_optimized(table, (address)StubRoutines::ppc64::_barret_constants, R0);
++}
++
++juint* StubRoutines::ppc64::generate_crc_constants() {
++ juint constants[CRC32_CONSTANTS_SIZE] = {
++ // Reduce 262144 kbits to 1024 bits
++ 0x99ea94a8UL, 0x00000000UL, 0x651797d2UL, 0x00000001UL, // x^261120 mod
p(x)` << 1, x^261184 mod p(x)` << 1
++ 0x945a8420UL, 0x00000000UL, 0x21e0d56cUL, 0x00000000UL, // x^260096 mod
p(x)` << 1, x^260160 mod p(x)` << 1
++ 0x30762706UL, 0x00000000UL, 0x0f95ecaaUL, 0x00000000UL, // x^259072 mod
p(x)` << 1, x^259136 mod p(x)` << 1
++ 0xa52fc582UL, 0x00000001UL, 0xebd224acUL, 0x00000001UL, // x^258048 mod
p(x)` << 1, x^258112 mod p(x)` << 1
++ 0xa4a7167aUL, 0x00000001UL, 0x0ccb97caUL, 0x00000000UL, // x^257024 mod
p(x)` << 1, x^257088 mod p(x)` << 1
++ 0x0c18249aUL, 0x00000000UL, 0x006ec8a8UL, 0x00000001UL, // x^256000 mod
p(x)` << 1, x^256064 mod p(x)` << 1
++ 0xa924ae7cUL, 0x00000000UL, 0x4f58f196UL, 0x00000001UL, // x^254976 mod
p(x)` << 1, x^255040 mod p(x)` << 1
++ 0xe12ccc12UL, 0x00000001UL, 0xa7192ca6UL, 0x00000001UL, // x^253952 mod
p(x)` << 1, x^254016 mod p(x)` << 1
++ 0xa0b9d4acUL, 0x00000000UL, 0x9a64bab2UL, 0x00000001UL, // x^252928 mod
p(x)` << 1, x^252992 mod p(x)` << 1
++ 0x95e8ddfeUL, 0x00000000UL, 0x14f4ed2eUL, 0x00000000UL, // x^251904 mod
p(x)` << 1, x^251968 mod p(x)` << 1
++ 0x233fddc4UL, 0x00000000UL, 0x1092b6a2UL, 0x00000001UL, // x^250880 mod
p(x)` << 1, x^250944 mod p(x)` << 1
++ 0xb4529b62UL, 0x00000001UL, 0xc8a1629cUL, 0x00000000UL, // x^249856 mod
p(x)` << 1, x^249920 mod p(x)` << 1
++ 0xa7fa0e64UL, 0x00000001UL, 0x7bf32e8eUL, 0x00000001UL, // x^248832 mod
p(x)` << 1, x^248896 mod p(x)` << 1
++ 0xb5334592UL, 0x00000001UL, 0xf8cc6582UL, 0x00000001UL, // x^247808 mod
p(x)` << 1, x^247872 mod p(x)` << 1
++ 0x1f8ee1b4UL, 0x00000001UL, 0x8631ddf0UL, 0x00000000UL, // x^246784 mod
p(x)` << 1, x^246848 mod p(x)` << 1
++ 0x6252e632UL, 0x00000000UL, 0x7e5a76d0UL, 0x00000000UL, // x^245760 mod
p(x)` << 1, x^245824 mod p(x)` << 1
++ 0xab973e84UL, 0x00000000UL, 0x2b09b31cUL, 0x00000000UL, // x^244736 mod
p(x)` << 1, x^244800 mod p(x)` << 1
++ 0x7734f5ecUL, 0x00000000UL, 0xb2df1f84UL, 0x00000001UL, // x^243712 mod
p(x)` << 1, x^243776 mod p(x)` << 1
++ 0x7c547798UL, 0x00000000UL, 0xd6f56afcUL, 0x00000001UL, // x^242688 mod
p(x)` << 1, x^242752 mod p(x)` << 1
++ 0x7ec40210UL, 0x00000000UL, 0xb9b5e70cUL, 0x00000001UL, // x^241664 mod
p(x)` << 1, x^241728 mod p(x)` << 1
++ 0xab1695a8UL, 0x00000001UL, 0x34b626d2UL, 0x00000000UL, // x^240640 mod
p(x)` << 1, x^240704 mod p(x)` << 1
++ 0x90494bbaUL, 0x00000000UL, 0x4c53479aUL, 0x00000001UL, // x^239616 mod
p(x)` << 1, x^239680 mod p(x)` << 1
++ 0x123fb816UL, 0x00000001UL, 0xa6d179a4UL, 0x00000001UL, // x^238592 mod
p(x)` << 1, x^238656 mod p(x)` << 1
++ 0xe188c74cUL, 0x00000001UL, 0x5abd16b4UL, 0x00000001UL, // x^237568 mod
p(x)` << 1, x^237632 mod p(x)` << 1
++ 0xc2d3451cUL, 0x00000001UL, 0x018f9852UL, 0x00000000UL, // x^236544 mod
p(x)` << 1, x^236608 mod p(x)` << 1
++ 0xf55cf1caUL, 0x00000000UL, 0x1fb3084aUL, 0x00000000UL, // x^235520 mod
p(x)` << 1, x^235584 mod p(x)` << 1
++ 0xa0531540UL, 0x00000001UL, 0xc53dfb04UL, 0x00000000UL, // x^234496 mod
p(x)` << 1, x^234560 mod p(x)` << 1
++ 0x32cd7ebcUL, 0x00000001UL, 0xe10c9ad6UL, 0x00000000UL, // x^233472 mod
p(x)` << 1, x^233536 mod p(x)` << 1
++ 0x73ab7f36UL, 0x00000000UL, 0x25aa994aUL, 0x00000000UL, // x^232448 mod
p(x)` << 1, x^232512 mod p(x)` << 1
++ 0x41aed1c2UL, 0x00000000UL, 0xfa3a74c4UL, 0x00000000UL, // x^231424 mod
p(x)` << 1, x^231488 mod p(x)` << 1
++ 0x36c53800UL, 0x00000001UL, 0x33eb3f40UL, 0x00000000UL, // x^230400 mod
p(x)` << 1, x^230464 mod p(x)` << 1
++ 0x26835a30UL, 0x00000001UL, 0x7193f296UL, 0x00000001UL, // x^229376 mod
p(x)` << 1, x^229440 mod p(x)` << 1
++ 0x6241b502UL, 0x00000000UL, 0x43f6c86aUL, 0x00000000UL, // x^228352 mod
p(x)` << 1, x^228416 mod p(x)` << 1
++ 0xd5196ad4UL, 0x00000000UL, 0x6b513ec6UL, 0x00000001UL, // x^227328 mod
p(x)` << 1, x^227392 mod p(x)` << 1
++ 0x9cfa769aUL, 0x00000000UL, 0xc8f25b4eUL, 0x00000000UL, // x^226304 mod
p(x)` << 1, x^226368 mod p(x)` << 1
++ 0x920e5df4UL, 0x00000000UL, 0xa45048ecUL, 0x00000001UL, // x^225280 mod
p(x)` << 1, x^225344 mod p(x)` << 1
++ 0x69dc310eUL, 0x00000001UL, 0x0c441004UL, 0x00000000UL, // x^224256 mod
p(x)` << 1, x^224320 mod p(x)` << 1
++ 0x09fc331cUL, 0x00000000UL, 0x0e17cad6UL, 0x00000000UL, // x^223232 mod
p(x)` << 1, x^223296 mod p(x)` << 1
++ 0x0d94a81eUL, 0x00000001UL, 0x253ae964UL, 0x00000001UL, // x^222208 mod
p(x)` << 1, x^222272 mod p(x)` << 1
++ 0x27a20ab2UL, 0x00000000UL, 0xd7c88ebcUL, 0x00000001UL, // x^221184 mod
p(x)` << 1, x^221248 mod p(x)` << 1
++ 0x14f87504UL, 0x00000001UL, 0xe7ca913aUL, 0x00000001UL, // x^220160 mod
p(x)` << 1, x^220224 mod p(x)` << 1
++ 0x4b076d96UL, 0x00000000UL, 0x33ed078aUL, 0x00000000UL, // x^219136 mod
p(x)` << 1, x^219200 mod p(x)` << 1
++ 0xda4d1e74UL, 0x00000000UL, 0xe1839c78UL, 0x00000000UL, // x^218112 mod
p(x)` << 1, x^218176 mod p(x)` << 1
++ 0x1b81f672UL, 0x00000000UL, 0x322b267eUL, 0x00000001UL, // x^217088 mod
p(x)` << 1, x^217152 mod p(x)` << 1
++ 0x9367c988UL, 0x00000000UL, 0x638231b6UL, 0x00000000UL, // x^216064 mod
p(x)` << 1, x^216128 mod p(x)` << 1
++ 0x717214caUL, 0x00000001UL, 0xee7f16f4UL, 0x00000001UL, // x^215040 mod
p(x)` << 1, x^215104 mod p(x)` << 1
++ 0x9f47d820UL, 0x00000000UL, 0x17d9924aUL, 0x00000001UL, // x^214016 mod
p(x)` << 1, x^214080 mod p(x)` << 1
++ 0x0d9a47d2UL, 0x00000001UL, 0xe1a9e0c4UL, 0x00000000UL, // x^212992 mod
p(x)` << 1, x^213056 mod p(x)` << 1
++ 0xa696c58cUL, 0x00000000UL, 0x403731dcUL, 0x00000001UL, // x^211968 mod
p(x)` << 1, x^212032 mod p(x)` << 1
++ 0x2aa28ec6UL, 0x00000000UL, 0xa5ea9682UL, 0x00000001UL, // x^210944 mod
p(x)` << 1, x^211008 mod p(x)` << 1
++ 0xfe18fd9aUL, 0x00000001UL, 0x01c5c578UL, 0x00000001UL, // x^209920 mod
p(x)` << 1, x^209984 mod p(x)` << 1
++ 0x9d4fc1aeUL, 0x00000001UL, 0xdddf6494UL, 0x00000000UL, // x^208896 mod
p(x)` << 1, x^208960 mod p(x)` << 1
++ 0xba0e3deaUL, 0x00000001UL, 0xf1c3db28UL, 0x00000000UL, // x^207872 mod
p(x)` << 1, x^207936 mod p(x)` << 1
++ 0x74b59a5eUL, 0x00000000UL, 0x3112fb9cUL, 0x00000001UL, // x^206848 mod
p(x)` << 1, x^206912 mod p(x)` << 1
++ 0xf2b5ea98UL, 0x00000000UL, 0xb680b906UL, 0x00000000UL, // x^205824 mod
p(x)` << 1, x^205888 mod p(x)` << 1
++ 0x87132676UL, 0x00000001UL, 0x1a282932UL, 0x00000000UL, // x^204800 mod
p(x)` << 1, x^204864 mod p(x)` << 1
++ 0x0a8c6ad4UL, 0x00000001UL, 0x89406e7eUL, 0x00000000UL, // x^203776 mod
p(x)` << 1, x^203840 mod p(x)` << 1
++ 0xe21dfe70UL, 0x00000001UL, 0xdef6be8cUL, 0x00000001UL, // x^202752 mod
p(x)` << 1, x^202816 mod p(x)` << 1
++ 0xda0050e4UL, 0x00000001UL, 0x75258728UL, 0x00000000UL, // x^201728 mod
p(x)` << 1, x^201792 mod p(x)` << 1
++ 0x772172aeUL, 0x00000000UL, 0x9536090aUL, 0x00000001UL, // x^200704 mod
p(x)` << 1, x^200768 mod p(x)` << 1
++ 0xe47724aaUL, 0x00000000UL, 0xf2455bfcUL, 0x00000000UL, // x^199680 mod
p(x)` << 1, x^199744 mod p(x)` << 1
++ 0x3cd63ac4UL, 0x00000000UL, 0x8c40baf4UL, 0x00000001UL, // x^198656 mod
p(x)` << 1, x^198720 mod p(x)` << 1
++ 0xbf47d352UL, 0x00000001UL, 0x4cd390d4UL, 0x00000000UL, // x^197632 mod
p(x)` << 1, x^197696 mod p(x)` << 1
++ 0x8dc1d708UL, 0x00000001UL, 0xe4ece95aUL, 0x00000001UL, // x^196608 mod
p(x)` << 1, x^196672 mod p(x)` << 1
++ 0x2d4620a4UL, 0x00000000UL, 0x1a3ee918UL, 0x00000000UL, // x^195584 mod
p(x)` << 1, x^195648 mod p(x)` << 1
++ 0x58fd1740UL, 0x00000000UL, 0x7c652fb8UL, 0x00000000UL, // x^194560 mod
p(x)` << 1, x^194624 mod p(x)` << 1
++ 0xdadd9bfcUL, 0x00000000UL, 0x1c67842cUL, 0x00000001UL, // x^193536 mod
p(x)` << 1, x^193600 mod p(x)` << 1
++ 0xea2140beUL, 0x00000001UL, 0x254f759cUL, 0x00000000UL, // x^192512 mod
p(x)` << 1, x^192576 mod p(x)` << 1
++ 0x9de128baUL, 0x00000000UL, 0x7ece94caUL, 0x00000000UL, // x^191488 mod
p(x)` << 1, x^191552 mod p(x)` << 1
++ 0x3ac3aa8eUL, 0x00000001UL, 0x38f258c2UL, 0x00000000UL, // x^190464 mod
p(x)` << 1, x^190528 mod p(x)` << 1
++ 0x99980562UL, 0x00000000UL, 0xcdf17b00UL, 0x00000001UL, // x^189440 mod
p(x)` << 1, x^189504 mod p(x)` << 1
++ 0xc1579c86UL, 0x00000001UL, 0x1f882c16UL, 0x00000001UL, // x^188416 mod
p(x)` << 1, x^188480 mod p(x)` << 1
++ 0x68dbbf94UL, 0x00000000UL, 0x00093fc8UL, 0x00000001UL, // x^187392 mod
p(x)` << 1, x^187456 mod p(x)` << 1
++ 0x4509fb04UL, 0x00000000UL, 0xcd684f16UL, 0x00000001UL, // x^186368 mod
p(x)` << 1, x^186432 mod p(x)` << 1
++ 0x202f6398UL, 0x00000001UL, 0x4bc6a70aUL, 0x00000000UL, // x^185344 mod
p(x)` << 1, x^185408 mod p(x)` << 1
++ 0x3aea243eUL, 0x00000001UL, 0x4fc7e8e4UL, 0x00000000UL, // x^184320 mod
p(x)` << 1, x^184384 mod p(x)` << 1
++ 0xb4052ae6UL, 0x00000001UL, 0x30103f1cUL, 0x00000001UL, // x^183296 mod
p(x)` << 1, x^183360 mod p(x)` << 1
++ 0xcd2a0ae8UL, 0x00000001UL, 0x11b0024cUL, 0x00000001UL, // x^182272 mod
p(x)` << 1, x^182336 mod p(x)` << 1
++ 0xfe4aa8b4UL, 0x00000001UL, 0x0b3079daUL, 0x00000001UL, // x^181248 mod
p(x)` << 1, x^181312 mod p(x)` << 1
++ 0xd1559a42UL, 0x00000001UL, 0x0192bcc2UL, 0x00000001UL, // x^180224 mod
p(x)` << 1, x^180288 mod p(x)` << 1
++ 0xf3e05eccUL, 0x00000001UL, 0x74838d50UL, 0x00000000UL, // x^179200 mod
p(x)` << 1, x^179264 mod p(x)` << 1
++ 0x04ddd2ccUL, 0x00000001UL, 0x1b20f520UL, 0x00000000UL, // x^178176 mod
p(x)` << 1, x^178240 mod p(x)` << 1
++ 0x5393153cUL, 0x00000001UL, 0x50c3590aUL, 0x00000000UL, // x^177152 mod
p(x)` << 1, x^177216 mod p(x)` << 1
++ 0x57e942c6UL, 0x00000000UL, 0xb41cac8eUL, 0x00000000UL, // x^176128 mod
p(x)` << 1, x^176192 mod p(x)` << 1
++ 0x2c633850UL, 0x00000001UL, 0x0c72cc78UL, 0x00000000UL, // x^175104 mod
p(x)` << 1, x^175168 mod p(x)` << 1
++ 0xebcaae4cUL, 0x00000000UL, 0x30cdb032UL, 0x00000000UL, // x^174080 mod
p(x)` << 1, x^174144 mod p(x)` << 1
++ 0x3ee532a6UL, 0x00000001UL, 0x3e09fc32UL, 0x00000001UL, // x^173056 mod
p(x)` << 1, x^173120 mod p(x)` << 1
++ 0xbf0cbc7eUL, 0x00000001UL, 0x1ed624d2UL, 0x00000000UL, // x^172032 mod
p(x)` << 1, x^172096 mod p(x)` << 1
++ 0xd50b7a5aUL, 0x00000000UL, 0x781aee1aUL, 0x00000000UL, // x^171008 mod
p(x)` << 1, x^171072 mod p(x)` << 1
++ 0x02fca6e8UL, 0x00000000UL, 0xc4d8348cUL, 0x00000001UL, // x^169984 mod
p(x)` << 1, x^170048 mod p(x)` << 1
++ 0x7af40044UL, 0x00000000UL, 0x57a40336UL, 0x00000000UL, // x^168960 mod
p(x)` << 1, x^169024 mod p(x)` << 1
++ 0x16178744UL, 0x00000000UL, 0x85544940UL, 0x00000000UL, // x^167936 mod
p(x)` << 1, x^168000 mod p(x)` << 1
++ 0x4c177458UL, 0x00000001UL, 0x9cd21e80UL, 0x00000001UL, // x^166912 mod
p(x)` << 1, x^166976 mod p(x)` << 1
++ 0x1b6ddf04UL, 0x00000001UL, 0x3eb95bc0UL, 0x00000001UL, // x^165888 mod
p(x)` << 1, x^165952 mod p(x)` << 1
++ 0xf3e29cccUL, 0x00000001UL, 0xdfc9fdfcUL, 0x00000001UL, // x^164864 mod
p(x)` << 1, x^164928 mod p(x)` << 1
++ 0x35ae7562UL, 0x00000001UL, 0xcd028bc2UL, 0x00000000UL, // x^163840 mod
p(x)` << 1, x^163904 mod p(x)` << 1
++ 0x90ef812cUL, 0x00000001UL, 0x90db8c44UL, 0x00000000UL, // x^162816 mod
p(x)` << 1, x^162880 mod p(x)` << 1
++ 0x67a2c786UL, 0x00000000UL, 0x0010a4ceUL, 0x00000001UL, // x^161792 mod
p(x)` << 1, x^161856 mod p(x)` << 1
++ 0x48b9496cUL, 0x00000000UL, 0xc8f4c72cUL, 0x00000001UL, // x^160768 mod
p(x)` << 1, x^160832 mod p(x)` << 1
++ 0x5a422de6UL, 0x00000001UL, 0x1c26170cUL, 0x00000000UL, // x^159744 mod
p(x)` << 1, x^159808 mod p(x)` << 1
++ 0xef0e3640UL, 0x00000001UL, 0xe3fccf68UL, 0x00000000UL, // x^158720 mod
p(x)` << 1, x^158784 mod p(x)` << 1
++ 0x006d2d26UL, 0x00000001UL, 0xd513ed24UL, 0x00000000UL, // x^157696 mod
p(x)` << 1, x^157760 mod p(x)` << 1
++ 0x170d56d6UL, 0x00000001UL, 0x141beadaUL, 0x00000000UL, // x^156672 mod
p(x)` << 1, x^156736 mod p(x)` << 1
++ 0xa5fb613cUL, 0x00000000UL, 0x1071aea0UL, 0x00000001UL, // x^155648 mod
p(x)` << 1, x^155712 mod p(x)` << 1
++ 0x40bbf7fcUL, 0x00000000UL, 0x2e19080aUL, 0x00000001UL, // x^154624 mod
p(x)` << 1, x^154688 mod p(x)` << 1
++ 0x6ac3a5b2UL, 0x00000001UL, 0x00ecf826UL, 0x00000001UL, // x^153600 mod
p(x)` << 1, x^153664 mod p(x)` << 1
++ 0xabf16230UL, 0x00000000UL, 0x69b09412UL, 0x00000000UL, // x^152576 mod
p(x)` << 1, x^152640 mod p(x)` << 1
++ 0xebe23facUL, 0x00000001UL, 0x22297bacUL, 0x00000001UL, // x^151552 mod
p(x)` << 1, x^151616 mod p(x)` << 1
++ 0x8b6a0894UL, 0x00000000UL, 0xe9e4b068UL, 0x00000000UL, // x^150528 mod
p(x)` << 1, x^150592 mod p(x)` << 1
++ 0x288ea478UL, 0x00000001UL, 0x4b38651aUL, 0x00000000UL, // x^149504 mod
p(x)` << 1, x^149568 mod p(x)` << 1
++ 0x6619c442UL, 0x00000001UL, 0x468360e2UL, 0x00000001UL, // x^148480 mod
p(x)` << 1, x^148544 mod p(x)` << 1
++ 0x86230038UL, 0x00000000UL, 0x121c2408UL, 0x00000000UL, // x^147456 mod
p(x)` << 1, x^147520 mod p(x)` << 1
++ 0x7746a756UL, 0x00000001UL, 0xda7e7d08UL, 0x00000000UL, // x^146432 mod
p(x)` << 1, x^146496 mod p(x)` << 1
++ 0x91b8f8f8UL, 0x00000001UL, 0x058d7652UL, 0x00000001UL, // x^145408 mod
p(x)` << 1, x^145472 mod p(x)` << 1
++ 0x8e167708UL, 0x00000000UL, 0x4a098a90UL, 0x00000001UL, // x^144384 mod
p(x)` << 1, x^144448 mod p(x)` << 1
++ 0x48b22d54UL, 0x00000001UL, 0x20dbe72eUL, 0x00000000UL, // x^143360 mod
p(x)` << 1, x^143424 mod p(x)` << 1
++ 0x44ba2c3cUL, 0x00000000UL, 0x1e7323e8UL, 0x00000001UL, // x^142336 mod
p(x)` << 1, x^142400 mod p(x)` << 1
++ 0xb54d2b52UL, 0x00000000UL, 0xd5d4bf94UL, 0x00000000UL, // x^141312 mod
p(x)` << 1, x^141376 mod p(x)` << 1
++ 0x05a4fd8aUL, 0x00000000UL, 0x99d8746cUL, 0x00000001UL, // x^140288 mod
p(x)` << 1, x^140352 mod p(x)` << 1
++ 0x39f9fc46UL, 0x00000001UL, 0xce9ca8a0UL, 0x00000000UL, // x^139264 mod
p(x)` << 1, x^139328 mod p(x)` << 1
++ 0x5a1fa824UL, 0x00000001UL, 0x136edeceUL, 0x00000000UL, // x^138240 mod
p(x)` << 1, x^138304 mod p(x)` << 1
++ 0x0a61ae4cUL, 0x00000000UL, 0x9b92a068UL, 0x00000001UL, // x^137216 mod
p(x)` << 1, x^137280 mod p(x)` << 1
++ 0x45e9113eUL, 0x00000001UL, 0x71d62206UL, 0x00000000UL, // x^136192 mod
p(x)` << 1, x^136256 mod p(x)` << 1
++ 0x6a348448UL, 0x00000000UL, 0xdfc50158UL, 0x00000000UL, // x^135168 mod
p(x)` << 1, x^135232 mod p(x)` << 1
++ 0x4d80a08cUL, 0x00000000UL, 0x517626bcUL, 0x00000001UL, // x^134144 mod
p(x)` << 1, x^134208 mod p(x)` << 1
++ 0x4b6837a0UL, 0x00000001UL, 0x48d1e4faUL, 0x00000001UL, // x^133120 mod
p(x)` << 1, x^133184 mod p(x)` << 1
++ 0x6896a7fcUL, 0x00000001UL, 0x94d8266eUL, 0x00000000UL, // x^132096 mod
p(x)` << 1, x^132160 mod p(x)` << 1
++ 0x4f187140UL, 0x00000001UL, 0x606c5e34UL, 0x00000000UL, // x^131072 mod
p(x)` << 1, x^131136 mod p(x)` << 1
++ 0x9581b9daUL, 0x00000001UL, 0x9766beaaUL, 0x00000001UL, // x^130048 mod
p(x)` << 1, x^130112 mod p(x)` << 1
++ 0x091bc984UL, 0x00000001UL, 0xd80c506cUL, 0x00000001UL, // x^129024 mod
p(x)` << 1, x^129088 mod p(x)` << 1
++ 0x1067223cUL, 0x00000000UL, 0x1e73837cUL, 0x00000000UL, // x^128000 mod
p(x)` << 1, x^128064 mod p(x)` << 1
++ 0xab16ea02UL, 0x00000001UL, 0x64d587deUL, 0x00000000UL, // x^126976 mod
p(x)` << 1, x^127040 mod p(x)` << 1
++ 0x3c4598a8UL, 0x00000001UL, 0xf4a507b0UL, 0x00000000UL, // x^125952 mod
p(x)` << 1, x^126016 mod p(x)` << 1
++ 0xb3735430UL, 0x00000000UL, 0x40e342fcUL, 0x00000000UL, // x^124928 mod
p(x)` << 1, x^124992 mod p(x)` << 1
++ 0xbb3fc0c0UL, 0x00000001UL, 0xd5ad9c3aUL, 0x00000001UL, // x^123904 mod
p(x)` << 1, x^123968 mod p(x)` << 1
++ 0x570ae19cUL, 0x00000001UL, 0x94a691a4UL, 0x00000000UL, // x^122880 mod
p(x)` << 1, x^122944 mod p(x)` << 1
++ 0xea910712UL, 0x00000001UL, 0x271ecdfaUL, 0x00000001UL, // x^121856 mod
p(x)` << 1, x^121920 mod p(x)` << 1
++ 0x67127128UL, 0x00000001UL, 0x9e54475aUL, 0x00000000UL, // x^120832 mod
p(x)` << 1, x^120896 mod p(x)` << 1
++ 0x19e790a2UL, 0x00000000UL, 0xc9c099eeUL, 0x00000000UL, // x^119808 mod
p(x)` << 1, x^119872 mod p(x)` << 1
++ 0x3788f710UL, 0x00000000UL, 0x9a2f736cUL, 0x00000000UL, // x^118784 mod
p(x)` << 1, x^118848 mod p(x)` << 1
++ 0x682a160eUL, 0x00000001UL, 0xbb9f4996UL, 0x00000000UL, // x^117760 mod
p(x)` << 1, x^117824 mod p(x)` << 1
++ 0x7f0ebd2eUL, 0x00000000UL, 0xdb688050UL, 0x00000001UL, // x^116736 mod
p(x)` << 1, x^116800 mod p(x)` << 1
++ 0x2b032080UL, 0x00000000UL, 0xe9b10af4UL, 0x00000000UL, // x^115712 mod
p(x)` << 1, x^115776 mod p(x)` << 1
++ 0xcfd1664aUL, 0x00000000UL, 0x2d4545e4UL, 0x00000001UL, // x^114688 mod
p(x)` << 1, x^114752 mod p(x)` << 1
++ 0xaa1181c2UL, 0x00000000UL, 0x0361139cUL, 0x00000000UL, // x^113664 mod
p(x)` << 1, x^113728 mod p(x)` << 1
++ 0xddd08002UL, 0x00000000UL, 0xa5a1a3a8UL, 0x00000001UL, // x^112640 mod
p(x)` << 1, x^112704 mod p(x)` << 1
++ 0xe8dd0446UL, 0x00000000UL, 0x6844e0b0UL, 0x00000000UL, // x^111616 mod
p(x)` << 1, x^111680 mod p(x)` << 1
++ 0xbbd94a00UL, 0x00000001UL, 0xc3762f28UL, 0x00000000UL, // x^110592 mod
p(x)` << 1, x^110656 mod p(x)` << 1
++ 0xab6cd180UL, 0x00000000UL, 0xd26287a2UL, 0x00000001UL, // x^109568 mod
p(x)` << 1, x^109632 mod p(x)` << 1
++ 0x31803ce2UL, 0x00000000UL, 0xf6f0bba8UL, 0x00000001UL, // x^108544 mod
p(x)` << 1, x^108608 mod p(x)` << 1
++ 0x24f40b0cUL, 0x00000000UL, 0x2ffabd62UL, 0x00000000UL, // x^107520 mod
p(x)` << 1, x^107584 mod p(x)` << 1
++ 0xba1d9834UL, 0x00000001UL, 0xfb4516b8UL, 0x00000000UL, // x^106496 mod
p(x)` << 1, x^106560 mod p(x)` << 1
++ 0x04de61aaUL, 0x00000001UL, 0x8cfa961cUL, 0x00000001UL, // x^105472 mod
p(x)` << 1, x^105536 mod p(x)` << 1
++ 0x13e40d46UL, 0x00000001UL, 0x9e588d52UL, 0x00000001UL, // x^104448 mod
p(x)` << 1, x^104512 mod p(x)` << 1
++ 0x415598a0UL, 0x00000001UL, 0x180f0bbcUL, 0x00000001UL, // x^103424 mod
p(x)` << 1, x^103488 mod p(x)` << 1
++ 0xbf6c8c90UL, 0x00000000UL, 0xe1d9177aUL, 0x00000000UL, // x^102400 mod
p(x)` << 1, x^102464 mod p(x)` << 1
++ 0x788b0504UL, 0x00000001UL, 0x05abc27cUL, 0x00000001UL, // x^101376 mod
p(x)` << 1, x^101440 mod p(x)` << 1
++ 0x38385d02UL, 0x00000000UL, 0x972e4a58UL, 0x00000000UL, // x^100352 mod
p(x)` << 1, x^100416 mod p(x)` << 1
++ 0xb6c83844UL, 0x00000001UL, 0x83499a5eUL, 0x00000001UL, // x^99328 mod p(x)`
<< 1, x^99392 mod p(x)` << 1
++ 0x51061a8aUL, 0x00000000UL, 0xc96a8ccaUL, 0x00000001UL, // x^98304 mod p(x)`
<< 1, x^98368 mod p(x)` << 1
++ 0x7351388aUL, 0x00000001UL, 0xa1a5b60cUL, 0x00000001UL, // x^97280 mod p(x)`
<< 1, x^97344 mod p(x)` << 1
++ 0x32928f92UL, 0x00000001UL, 0xe4b6ac9cUL, 0x00000000UL, // x^96256 mod p(x)`
<< 1, x^96320 mod p(x)` << 1
++ 0xe6b4f48aUL, 0x00000000UL, 0x807e7f5aUL, 0x00000001UL, // x^95232 mod p(x)`
<< 1, x^95296 mod p(x)` << 1
++ 0x39d15e90UL, 0x00000000UL, 0x7a7e3bc8UL, 0x00000001UL, // x^94208 mod p(x)`
<< 1, x^94272 mod p(x)` << 1
++ 0x312d6074UL, 0x00000000UL, 0xd73975daUL, 0x00000000UL, // x^93184 mod p(x)`
<< 1, x^93248 mod p(x)` << 1
++ 0x7bbb2cc4UL, 0x00000001UL, 0x7375d038UL, 0x00000001UL, // x^92160 mod p(x)`
<< 1, x^92224 mod p(x)` << 1
++ 0x6ded3e18UL, 0x00000001UL, 0x193680bcUL, 0x00000000UL, // x^91136 mod p(x)`
<< 1, x^91200 mod p(x)` << 1
++ 0xf1638b16UL, 0x00000000UL, 0x999b06f6UL, 0x00000000UL, // x^90112 mod p(x)`
<< 1, x^90176 mod p(x)` << 1
++ 0xd38b9eccUL, 0x00000001UL, 0xf685d2b8UL, 0x00000001UL, // x^89088 mod p(x)`
<< 1, x^89152 mod p(x)` << 1
++ 0x8b8d09dcUL, 0x00000001UL, 0xf4ecbed2UL, 0x00000001UL, // x^88064 mod p(x)`
<< 1, x^88128 mod p(x)` << 1
++ 0xe7bc27d2UL, 0x00000000UL, 0xba16f1a0UL, 0x00000000UL, // x^87040 mod p(x)`
<< 1, x^87104 mod p(x)` << 1
++ 0x275e1e96UL, 0x00000000UL, 0x15aceac4UL, 0x00000001UL, // x^86016 mod p(x)`
<< 1, x^86080 mod p(x)` << 1
++ 0xe2e3031eUL, 0x00000000UL, 0xaeff6292UL, 0x00000001UL, // x^84992 mod p(x)`
<< 1, x^85056 mod p(x)` << 1
++ 0x041c84d8UL, 0x00000001UL, 0x9640124cUL, 0x00000000UL, // x^83968 mod p(x)`
<< 1, x^84032 mod p(x)` << 1
++ 0x706ce672UL, 0x00000000UL, 0x14f41f02UL, 0x00000001UL, // x^82944 mod p(x)`
<< 1, x^83008 mod p(x)` << 1
++ 0x5d5070daUL, 0x00000001UL, 0x9c5f3586UL, 0x00000000UL, // x^81920 mod p(x)`
<< 1, x^81984 mod p(x)` << 1
++ 0x38f9493aUL, 0x00000000UL, 0x878275faUL, 0x00000001UL, // x^80896 mod p(x)`
<< 1, x^80960 mod p(x)` << 1
++ 0xa3348a76UL, 0x00000000UL, 0xddc42ce8UL, 0x00000000UL, // x^79872 mod p(x)`
<< 1, x^79936 mod p(x)` << 1
++ 0xad0aab92UL, 0x00000001UL, 0x81d2c73aUL, 0x00000001UL, // x^78848 mod p(x)`
<< 1, x^78912 mod p(x)` << 1
++ 0x9e85f712UL, 0x00000001UL, 0x41c9320aUL, 0x00000001UL, // x^77824 mod p(x)`
<< 1, x^77888 mod p(x)` << 1
++ 0x5a871e76UL, 0x00000000UL, 0x5235719aUL, 0x00000001UL, // x^76800 mod p(x)`
<< 1, x^76864 mod p(x)` << 1
++ 0x7249c662UL, 0x00000001UL, 0xbe27d804UL, 0x00000000UL, // x^75776 mod p(x)`
<< 1, x^75840 mod p(x)` << 1
++ 0x3a084712UL, 0x00000000UL, 0x6242d45aUL, 0x00000000UL, // x^74752 mod p(x)`
<< 1, x^74816 mod p(x)` << 1
++ 0xed438478UL, 0x00000000UL, 0x9a53638eUL, 0x00000000UL, // x^73728 mod p(x)`
<< 1, x^73792 mod p(x)` << 1
++ 0xabac34ccUL, 0x00000000UL, 0x001ecfb6UL, 0x00000001UL, // x^72704 mod p(x)`
<< 1, x^72768 mod p(x)` << 1
++ 0x5f35ef3eUL, 0x00000000UL, 0x6d7c2d64UL, 0x00000001UL, // x^71680 mod p(x)`
<< 1, x^71744 mod p(x)` << 1
++ 0x47d6608cUL, 0x00000000UL, 0xd0ce46c0UL, 0x00000001UL, // x^70656 mod p(x)`
<< 1, x^70720 mod p(x)` << 1
++ 0x2d01470eUL, 0x00000000UL, 0x24c907b4UL, 0x00000001UL, // x^69632 mod p(x)`
<< 1, x^69696 mod p(x)` << 1
++ 0x58bbc7b0UL, 0x00000001UL, 0x18a555caUL, 0x00000000UL, // x^68608 mod p(x)`
<< 1, x^68672 mod p(x)` << 1
++ 0xc0a23e8eUL, 0x00000000UL, 0x6b0980bcUL, 0x00000000UL, // x^67584 mod p(x)`
<< 1, x^67648 mod p(x)` << 1
++ 0xebd85c88UL, 0x00000001UL, 0x8bbba964UL, 0x00000000UL, // x^66560 mod p(x)`
<< 1, x^66624 mod p(x)` << 1
++ 0x9ee20bb2UL, 0x00000001UL, 0x070a5a1eUL, 0x00000001UL, // x^65536 mod p(x)`
<< 1, x^65600 mod p(x)` << 1
++ 0xacabf2d6UL, 0x00000001UL, 0x2204322aUL, 0x00000000UL, // x^64512 mod p(x)`
<< 1, x^64576 mod p(x)` << 1
++ 0xb7963d56UL, 0x00000001UL, 0xa27524d0UL, 0x00000000UL, // x^63488 mod p(x)`
<< 1, x^63552 mod p(x)` << 1
++ 0x7bffa1feUL, 0x00000001UL, 0x20b1e4baUL, 0x00000000UL, // x^62464 mod p(x)`
<< 1, x^62528 mod p(x)` << 1
++ 0x1f15333eUL, 0x00000000UL, 0x32cc27fcUL, 0x00000000UL, // x^61440 mod p(x)`
<< 1, x^61504 mod p(x)` << 1
++ 0x8593129eUL, 0x00000001UL, 0x44dd22b8UL, 0x00000000UL, // x^60416 mod p(x)`
<< 1, x^60480 mod p(x)` << 1
++ 0x9cb32602UL, 0x00000001UL, 0xdffc9e0aUL, 0x00000000UL, // x^59392 mod p(x)`
<< 1, x^59456 mod p(x)` << 1
++ 0x42b05cc8UL, 0x00000001UL, 0xb7a0ed14UL, 0x00000001UL, // x^58368 mod p(x)`
<< 1, x^58432 mod p(x)` << 1
++ 0xbe49e7a4UL, 0x00000001UL, 0xc7842488UL, 0x00000000UL, // x^57344 mod p(x)`
<< 1, x^57408 mod p(x)` << 1
++ 0x08f69d6cUL, 0x00000001UL, 0xc02a4feeUL, 0x00000001UL, // x^56320 mod p(x)`
<< 1, x^56384 mod p(x)` << 1
++ 0x6c0971f0UL, 0x00000000UL, 0x3c273778UL, 0x00000000UL, // x^55296 mod p(x)`
<< 1, x^55360 mod p(x)` << 1
++ 0x5b16467aUL, 0x00000000UL, 0xd63f8894UL, 0x00000001UL, // x^54272 mod p(x)`
<< 1, x^54336 mod p(x)` << 1
++ 0x551a628eUL, 0x00000001UL, 0x6be557d6UL, 0x00000000UL, // x^53248 mod p(x)`
<< 1, x^53312 mod p(x)` << 1
++ 0x9e42ea92UL, 0x00000001UL, 0x6a7806eaUL, 0x00000000UL, // x^52224 mod p(x)`
<< 1, x^52288 mod p(x)` << 1
++ 0x2fa83ff2UL, 0x00000001UL, 0x6155aa0cUL, 0x00000001UL, // x^51200 mod p(x)`
<< 1, x^51264 mod p(x)` << 1
++ 0x1ca9cde0UL, 0x00000001UL, 0x908650acUL, 0x00000000UL, // x^50176 mod p(x)`
<< 1, x^50240 mod p(x)` << 1
++ 0xc8e5cd74UL, 0x00000000UL, 0xaa5a8084UL, 0x00000000UL, // x^49152 mod p(x)`
<< 1, x^49216 mod p(x)` << 1
++ 0x96c27f0cUL, 0x00000000UL, 0x91bb500aUL, 0x00000001UL, // x^48128 mod p(x)`
<< 1, x^48192 mod p(x)` << 1
++ 0x2baed926UL, 0x00000000UL, 0x64e9bed0UL, 0x00000000UL, // x^47104 mod p(x)`
<< 1, x^47168 mod p(x)` << 1
++ 0x7c8de8d2UL, 0x00000001UL, 0x9444f302UL, 0x00000000UL, // x^46080 mod p(x)`
<< 1, x^46144 mod p(x)` << 1
++ 0xd43d6068UL, 0x00000000UL, 0x9db07d3cUL, 0x00000001UL, // x^45056 mod p(x)`
<< 1, x^45120 mod p(x)` << 1
++ 0xcb2c4b26UL, 0x00000000UL, 0x359e3e6eUL, 0x00000001UL, // x^44032 mod p(x)`
<< 1, x^44096 mod p(x)` << 1
++ 0x45b8da26UL, 0x00000001UL, 0xe4f10dd2UL, 0x00000001UL, // x^43008 mod p(x)`
<< 1, x^43072 mod p(x)` << 1
++ 0x8fff4b08UL, 0x00000001UL, 0x24f5735eUL, 0x00000001UL, // x^41984 mod p(x)`
<< 1, x^42048 mod p(x)` << 1
++ 0x50b58ed0UL, 0x00000001UL, 0x24760a4cUL, 0x00000001UL, // x^40960 mod p(x)`
<< 1, x^41024 mod p(x)` << 1
++ 0x549f39bcUL, 0x00000001UL, 0x0f1fc186UL, 0x00000000UL, // x^39936 mod p(x)`
<< 1, x^40000 mod p(x)` << 1
++ 0xef4d2f42UL, 0x00000000UL, 0x150e4cc4UL, 0x00000000UL, // x^38912 mod p(x)`
<< 1, x^38976 mod p(x)` << 1
++ 0xb1468572UL, 0x00000001UL, 0x2a6204e8UL, 0x00000000UL, // x^37888 mod p(x)`
<< 1, x^37952 mod p(x)` << 1
++ 0x3d7403b2UL, 0x00000001UL, 0xbeb1d432UL, 0x00000000UL, // x^36864 mod p(x)`
<< 1, x^36928 mod p(x)` << 1
++ 0xa4681842UL, 0x00000001UL, 0x35f3f1f0UL, 0x00000001UL, // x^35840 mod p(x)`
<< 1, x^35904 mod p(x)` << 1
++ 0x67714492UL, 0x00000001UL, 0x74fe2232UL, 0x00000000UL, // x^34816 mod p(x)`
<< 1, x^34880 mod p(x)` << 1
++ 0xe599099aUL, 0x00000001UL, 0x1ac6e2baUL, 0x00000000UL, // x^33792 mod p(x)`
<< 1, x^33856 mod p(x)` << 1
++ 0xfe128194UL, 0x00000000UL, 0x13fca91eUL, 0x00000000UL, // x^32768 mod p(x)`
<< 1, x^32832 mod p(x)` << 1
++ 0x77e8b990UL, 0x00000000UL, 0x83f4931eUL, 0x00000001UL, // x^31744 mod p(x)`
<< 1, x^31808 mod p(x)` << 1
++ 0xa267f63aUL, 0x00000001UL, 0xb6d9b4e4UL, 0x00000000UL, // x^30720 mod p(x)`
<< 1, x^30784 mod p(x)` << 1
++ 0x945c245aUL, 0x00000001UL, 0xb5188656UL, 0x00000000UL, // x^29696 mod p(x)`
<< 1, x^29760 mod p(x)` << 1
++ 0x49002e76UL, 0x00000001UL, 0x27a81a84UL, 0x00000000UL, // x^28672 mod p(x)`
<< 1, x^28736 mod p(x)` << 1
++ 0xbb8310a4UL, 0x00000001UL, 0x25699258UL, 0x00000001UL, // x^27648 mod p(x)`
<< 1, x^27712 mod p(x)` << 1
++ 0x9ec60bccUL, 0x00000001UL, 0xb23de796UL, 0x00000001UL, // x^26624 mod p(x)`
<< 1, x^26688 mod p(x)` << 1
++ 0x2d8590aeUL, 0x00000001UL, 0xfe4365dcUL, 0x00000000UL, // x^25600 mod p(x)`
<< 1, x^25664 mod p(x)` << 1
++ 0x65b00684UL, 0x00000000UL, 0xc68f497aUL, 0x00000000UL, // x^24576 mod p(x)`
<< 1, x^24640 mod p(x)` << 1
++ 0x5e5aeadcUL, 0x00000001UL, 0xfbf521eeUL, 0x00000000UL, // x^23552 mod p(x)`
<< 1, x^23616 mod p(x)` << 1
++ 0xb77ff2b0UL, 0x00000000UL, 0x5eac3378UL, 0x00000001UL, // x^22528 mod p(x)`
<< 1, x^22592 mod p(x)` << 1
++ 0x88da2ff6UL, 0x00000001UL, 0x34914b90UL, 0x00000001UL, // x^21504 mod p(x)`
<< 1, x^21568 mod p(x)` << 1
++ 0x63da929aUL, 0x00000000UL, 0x16335cfeUL, 0x00000000UL, // x^20480 mod p(x)`
<< 1, x^20544 mod p(x)` << 1
++ 0x389caa80UL, 0x00000001UL, 0x0372d10cUL, 0x00000001UL, // x^19456 mod p(x)`
<< 1, x^19520 mod p(x)` << 1
++ 0x3db599d2UL, 0x00000001UL, 0x5097b908UL, 0x00000001UL, // x^18432 mod p(x)`
<< 1, x^18496 mod p(x)` << 1
++ 0x22505a86UL, 0x00000001UL, 0x227a7572UL, 0x00000001UL, // x^17408 mod p(x)`
<< 1, x^17472 mod p(x)` << 1
++ 0x6bd72746UL, 0x00000001UL, 0x9a8f75c0UL, 0x00000000UL, // x^16384 mod p(x)`
<< 1, x^16448 mod p(x)` << 1
++ 0xc3faf1d4UL, 0x00000001UL, 0x682c77a2UL, 0x00000000UL, // x^15360 mod p(x)`
<< 1, x^15424 mod p(x)` << 1
++ 0x111c826cUL, 0x00000001UL, 0x231f091cUL, 0x00000000UL, // x^14336 mod p(x)`
<< 1, x^14400 mod p(x)` << 1
++ 0x153e9fb2UL, 0x00000000UL, 0x7d4439f2UL, 0x00000000UL, // x^13312 mod p(x)`
<< 1, x^13376 mod p(x)` << 1
++ 0x2b1f7b60UL, 0x00000000UL, 0x7e221efcUL, 0x00000001UL, // x^12288 mod p(x)`
<< 1, x^12352 mod p(x)` << 1
++ 0xb1dba570UL, 0x00000000UL, 0x67457c38UL, 0x00000001UL, // x^11264 mod p(x)`
<< 1, x^11328 mod p(x)` << 1
++ 0xf6397b76UL, 0x00000001UL, 0xbdf081c4UL, 0x00000000UL, // x^10240 mod p(x)`
<< 1, x^10304 mod p(x)` << 1
++ 0x56335214UL, 0x00000001UL, 0x6286d6b0UL, 0x00000001UL, // x^9216 mod p(x)`
<< 1, x^9280 mod p(x)` << 1
++ 0xd70e3986UL, 0x00000001UL, 0xc84f001cUL, 0x00000000UL, // x^8192 mod p(x)`
<< 1, x^8256 mod p(x)` << 1
++ 0x3701a774UL, 0x00000000UL, 0x64efe7c0UL, 0x00000000UL, // x^7168 mod p(x)`
<< 1, x^7232 mod p(x)` << 1
++ 0xac81ef72UL, 0x00000000UL, 0x0ac2d904UL, 0x00000000UL, // x^6144 mod p(x)`
<< 1, x^6208 mod p(x)` << 1
++ 0x33212464UL, 0x00000001UL, 0xfd226d14UL, 0x00000000UL, // x^5120 mod p(x)`
<< 1, x^5184 mod p(x)` << 1
++ 0xe4e45610UL, 0x00000000UL, 0x1cfd42e0UL, 0x00000001UL, // x^4096 mod p(x)`
<< 1, x^4160 mod p(x)` << 1
++ 0x0c1bd370UL, 0x00000000UL, 0x6e5a5678UL, 0x00000001UL, // x^3072 mod p(x)`
<< 1, x^3136 mod p(x)` << 1
++ 0xa7b9e7a6UL, 0x00000001UL, 0xd888fe22UL, 0x00000001UL, // x^2048 mod p(x)`
<< 1, x^2112 mod p(x)` << 1
++ 0x7d657a10UL, 0x00000000UL, 0xaf77fcd4UL, 0x00000001UL, // x^1024 mod p(x)`
<< 1, x^1088 mod p(x)` << 1
++
++ // Reduce final 1024-2048 bits to 64 bits, shifting 32 bits to include the
trailing 32 bits of zeros
++ 0xec447f11UL, 0x99168a18UL, 0x13e8221eUL, 0xed837b26UL, // x^2048 mod p(x)`,
x^2016 mod p(x)`, x^1984 mod p(x)`, x^1952 mod p(x)`
++ 0x8fd2cd3cUL, 0xe23e954eUL, 0x47b9ce5aUL, 0xc8acdd81UL, // x^1920 mod p(x)`,
x^1888 mod p(x)`, x^1856 mod p(x)`, x^1824 mod p(x)`
++ 0x6b1d2b53UL, 0x92f8befeUL, 0xd4277e25UL, 0xd9ad6d87UL, // x^1792 mod p(x)`,
x^1760 mod p(x)`, x^1728 mod p(x)`, x^1696 mod p(x)`
++ 0x291ea462UL, 0xf38a3556UL, 0x33fbca3bUL, 0xc10ec5e0UL, // x^1664 mod p(x)`,
x^1632 mod p(x)`, x^1600 mod p(x)`, x^1568 mod p(x)`
++ 0x62b6ca4bUL, 0x974ac562UL, 0x82e02e2fUL, 0xc0b55b0eUL, // x^1536 mod p(x)`,
x^1504 mod p(x)`, x^1472 mod p(x)`, x^1440 mod p(x)`
++ 0x784d2a56UL, 0x855712b3UL, 0xe172334dUL, 0x71aa1df0UL, // x^1408 mod p(x)`,
x^1376 mod p(x)`, x^1344 mod p(x)`, x^1312 mod p(x)`
++ 0x0eaee722UL, 0xa5abe9f8UL, 0x3969324dUL, 0xfee3053eUL, // x^1280 mod p(x)`,
x^1248 mod p(x)`, x^1216 mod p(x)`, x^1184 mod p(x)`
++ 0xdb54814cUL, 0x1fa0943dUL, 0x3eb2bd08UL, 0xf44779b9UL, // x^1152 mod p(x)`,
x^1120 mod p(x)`, x^1088 mod p(x)`, x^1056 mod p(x)`
++ 0xd7bbfe6aUL, 0xa53ff440UL, 0x00cc3374UL, 0xf5449b3fUL, // x^1024 mod p(x)`,
x^992 mod p(x)`, x^960 mod p(x)`, x^928 mod p(x)`
++ 0x6325605cUL, 0xebe7e356UL, 0xd777606eUL, 0x6f8346e1UL, // x^896 mod p(x)`,
x^864 mod p(x)`, x^832 mod p(x)`, x^800 mod p(x)`
++ 0xe5b592b8UL, 0xc65a272cUL, 0xc0b95347UL, 0xe3ab4f2aUL, // x^768 mod p(x)`,
x^736 mod p(x)`, x^704 mod p(x)`, x^672 mod p(x)`
++ 0x4721589fUL, 0x5705a9caUL, 0x329ecc11UL, 0xaa2215eaUL, // x^640 mod p(x)`,
x^608 mod p(x)`, x^576 mod p(x)`, x^544 mod p(x)`
++ 0x88d14467UL, 0xe3720acbUL, 0xd95efd26UL, 0x1ed8f66eUL, // x^512 mod p(x)`,
x^480 mod p(x)`, x^448 mod p(x)`, x^416 mod p(x)`
++ 0x15141c31UL, 0xba1aca03UL, 0xa700e96aUL, 0x78ed02d5UL, // x^384 mod p(x)`,
x^352 mod p(x)`, x^320 mod p(x)`, x^288 mod p(x)`
++ 0xed627daeUL, 0xad2a31b3UL, 0x32b39da3UL, 0xba8ccbe8UL, // x^256 mod p(x)`,
x^224 mod p(x)`, x^192 mod p(x)`, x^160 mod p(x)`
++ 0xa06a2517UL, 0x6655004fUL, 0xb1e6b092UL, 0xedb88320UL // x^128 mod p(x)`,
x^96 mod p(x)`, x^64 mod p(x)`, x^32 mod p(x)`
++ };
++
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*)ptr, constants, sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ return ptr;
++}
++
++juint* StubRoutines::ppc64::generate_crc_barret_constants() {
++ juint barret_constants[CRC32_BARRET_CONSTANTS] = {
++ 0xf7011641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL,
++ 0xdb710641UL, 0x00000001UL, 0x00000000UL, 0x00000000UL
++ };
++ juint* ptr = (juint*) malloc(sizeof(juint) * CRC32_CONSTANTS_SIZE);
++ guarantee(((intptr_t)ptr & 0xF) == 0, "16-byte alignment needed");
++ guarantee(ptr != NULL, "allocation error of a crc table");
++ memcpy((void*) ptr, barret_constants, sizeof(juint) * CRC32_BARRET_CONSTANTS);
++ return ptr;
++}
++
+ // CRC32 Intrinsics.
+ /**
+ * crc_table[] from jdk/src/share/native/java/util/zip/zlib-1.2.8/crc32.h
+@@ -477,3 +782,7 @@
+ #endif
+ }
+ };
++
++juint* StubRoutines::ppc64::_constants = StubRoutines::ppc64::generate_crc_constants();
++
++juint* StubRoutines::ppc64::_barret_constants =
StubRoutines::ppc64::generate_crc_barret_constants();
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp
+@@ -45,6 +45,8 @@
+ #else
+ #define CRC32_TABLES 1
+ #endif
++#define CRC32_CONSTANTS_SIZE 1084
++#define CRC32_BARRET_CONSTANTS 10
+
+ class ppc64 {
+ friend class StubGenerator;
+@@ -53,11 +55,17 @@
+
+ // CRC32 Intrinsics.
+ static juint _crc_table[CRC32_TABLES][CRC32_COLUMN_SIZE];
++ static juint* _constants;
++ static juint* _barret_constants;
+
+ public:
+
+ // CRC32 Intrinsics.
+ static void generate_load_crc_table_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_constants_addr(MacroAssembler* masm, Register table);
++ static void generate_load_crc_barret_constants_addr(MacroAssembler* masm, Register
table);
++ static juint* generate_crc_constants();
++ static juint* generate_crc_barret_constants();
+
+ };
+
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.cpp
+@@ -102,7 +102,7 @@
+ // Create and print feature-string.
+ char buf[(num_features+1) * 16]; // Max 16 chars per feature.
+ jio_snprintf(buf, sizeof(buf),
+- "ppc64%s%s%s%s%s%s%s%s%s",
++ "ppc64%s%s%s%s%s%s%s%s%s%s",
+ (has_fsqrt() ? " fsqrt" : ""),
+ (has_isel() ? " isel" : ""),
+ (has_lxarxeh() ? " lxarxeh" : ""),
+@@ -112,7 +112,8 @@
+ (has_popcntw() ? " popcntw" : ""),
+ (has_fcfids() ? " fcfids" : ""),
+ (has_vand() ? " vand" : ""),
+- (has_vcipher() ? " aes" : "")
++ (has_vcipher() ? " aes" : ""),
++ (has_vpmsumb() ? " vpmsumb" : "")
+ // Make sure number of %s matches num_features!
+ );
+ _features_str = strdup(buf);
+@@ -490,6 +491,7 @@
+ a->fcfids(F3, F4); // code[8] -> fcfids
+ a->vand(VR0, VR0, VR0); // code[9] -> vand
+ a->vcipher(VR0, VR1, VR2); // code[10] -> vcipher
++ a->vpmsumb(VR0, VR1, VR2); // code[11] -> vpmsumb
+ a->blr();
+
+ // Emit function to set one cache line to zero. Emit function descriptor and get
pointer to it.
+@@ -534,6 +536,7 @@
+ if (code[feature_cntr++]) features |= fcfids_m;
+ if (code[feature_cntr++]) features |= vand_m;
+ if (code[feature_cntr++]) features |= vcipher_m;
++ if (code[feature_cntr++]) features |= vpmsumb_m;
+
+ // Print the detection code.
+ if (PrintAssembly) {
+diff --git openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+--- openjdk.orig/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
++++ openjdk/hotspot/src/cpu/ppc/vm/vm_version_ppc.hpp
+@@ -43,6 +43,7 @@
+ vand,
+ dcba,
+ vcipher,
++ vpmsumb,
+ num_features // last entry to count features
+ };
+ enum Feature_Flag_Set {
+@@ -58,6 +59,7 @@
+ vand_m = (1 << vand ),
+ dcba_m = (1 << dcba ),
+ vcipher_m = (1 << vcipher),
++ vpmsumb_m = (1 << vpmsumb),
+ all_features_m = -1
+ };
+ static int _features;
+@@ -86,6 +88,7 @@
+ static bool has_vand() { return (_features & vand_m) != 0; }
+ static bool has_dcba() { return (_features & dcba_m) != 0; }
+ static bool has_vcipher() { return (_features & vcipher_m) != 0; }
++ static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; }
+
+ static const char* cpu_features() { return _features_str; }
+
commit bebddb631258954bd81c3c699e2756721d9395f7
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Mon Jan 28 00:08:24 2019 -0500
Introduce sa_arches for architectures with sa-jdi.jar and include aarch64
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 0f4e214..d4df5e9 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -59,6 +59,7 @@
%global ppc64be ppc64 ppc64p7
%global multilib_arches %{power64} sparc64 x86_64
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64} %{power64}
+%global sa_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
# By default, we build a debug build during main build on JIT architectures
%if %{with slowdebug}
@@ -749,7 +750,7 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/ir.idl
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jconsole.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/orb.idl
-%ifarch x86_64 %{ix86}
+%ifarch %{sa_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/sa-jdi.jar
%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/dt.jar
@@ -2347,6 +2348,9 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Thu Jan 24 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-0
+- Introduce sa_arches for architectures with sa-jdi.jar and include aarch64
+
* Thu Jan 10 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-0
- Update to aarch64-shenandoah-jdk8u191-b14.
- Adjust JDK-8073139/PR1758/RH1191652 to apply following 8155627 backport.
commit 23bfad2f934fc19791b1f9d67e553b9540da59b0
Author: Andrew Hughes <gnu.andrew(a)redhat.com>
Date: Thu Jan 17 01:04:08 2019 -0500
Update to aarch64-shenandoah-jdk8u191-b14.
Adjust JDK-8073139/PR1758/RH1191652 to apply following 8155627 backport.
diff --git a/.gitignore b/.gitignore
index 4a93ad0..95356b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,4 @@
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b10.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b12.tar.xz
/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz
+/aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b14.tar.xz
diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec
index 7c9af01..0f4e214 100644
--- a/java-1.8.0-openjdk.spec
+++ b/java-1.8.0-openjdk.spec
@@ -225,7 +225,7 @@
# note, following three variables are sedded from update_sources if used correctly.
Hardcode them rather there.
%global shenandoah_project aarch64-port
%global shenandoah_repo jdk8u-shenandoah
-%global shenandoah_revision aarch64-shenandoah-jdk8u191-b13
+%global shenandoah_revision aarch64-shenandoah-jdk8u191-b14
# Define old aarch64/jdk8u tree variables for compatibility
%global project %{shenandoah_project}
%global repo %{shenandoah_repo}
@@ -2347,6 +2347,10 @@ require "copy_jdk_configs.lua"
%endif
%changelog
+* Thu Jan 10 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b14-0
+- Update to aarch64-shenandoah-jdk8u191-b14.
+- Adjust JDK-8073139/PR1758/RH1191652 to apply following 8155627 backport.
+
* Wed Jan 09 2019 Andrew Hughes <gnu.andrew(a)redhat.com> - 1:1.8.0.191.b13-0
- Update to aarch64-shenandoah-jdk8u191-b13.
- Update tarball generation script in preparation for PR3667/RH1656676 SunEC changes.
diff --git
a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
index 746529a..6511281 100644
--- a/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
+++ b/jdk8073139-pr1758-rh1191652-ppc64_le_says_its_arch_is_ppc64_not_ppc64le_root.patch
@@ -1,28 +1,16 @@
# HG changeset patch
-# User sgehwolf
+# User asmundak
# Date 1537883922 -7200
# Tue Sep 25 15:58:42 2018 +0200
# Node ID 2fabe07c0bd8bf21400313f3bb9b8e80fcb31724
# Parent 91867683f73de3882ef88981a79995beeeb1e980
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues
with Java tooling
Reviewed-by: erikj, goetz, dholmes
+Contributed-by: Andrew Hughes <gnu.andrew(a)redhat.com>, Alexander Smundak
<asmundak(a)google.com>
-diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4
---- openjdk/common/autoconf/toolchain.m4
-+++ openjdk/common/autoconf/toolchain.m4
-@@ -1125,6 +1125,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_COMPILER_FLAGS_FOR_JDK],
- else
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
- fi
-+ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
-+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DABI_ELFv2"
-+ fi
- if test "x$OPENJDK_TARGET_OS" = xlinux; then
- COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
- fi
-diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4
---- openjdk/common/autoconf/jdk-options.m4
-+++ openjdk/common/autoconf/jdk-options.m4
+diff --git openjdk.orig///common/autoconf/jdk-options.m4
openjdk///common/autoconf/jdk-options.m4
+--- openjdk.orig///common/autoconf/jdk-options.m4
++++ openjdk///common/autoconf/jdk-options.m4
@@ -158,7 +158,7 @@
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
INCLUDE_SA=false
@@ -31,10 +19,10 @@ diff --git a/common/autoconf/jdk-options.m4
b/common/autoconf/jdk-options.m4
+ if test "x$VAR_CPU" = xppc64 -o "x$VAR_CPU" = xppc64le ; then
INCLUDE_SA=false
fi
- if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
---- openjdk/common/autoconf/platform.m4
-+++ openjdk/common/autoconf/platform.m4
+ AC_SUBST(INCLUDE_SA)
+diff --git openjdk.orig///common/autoconf/platform.m4
openjdk///common/autoconf/platform.m4
+--- openjdk.orig///common/autoconf/platform.m4
++++ openjdk///common/autoconf/platform.m4
@@ -67,7 +67,7 @@
VAR_CPU_ENDIAN=big
;;
@@ -44,3 +32,16 @@ diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
VAR_CPU_ARCH=ppc
VAR_CPU_BITS=64
VAR_CPU_ENDIAN=little
+diff --git openjdk.orig///common/autoconf/toolchain.m4
openjdk///common/autoconf/toolchain.m4
+--- openjdk.orig///common/autoconf/toolchain.m4
++++ openjdk///common/autoconf/toolchain.m4
+@@ -1123,6 +1123,9 @@
+ else
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -D_BIG_ENDIAN"
+ fi
++ if test "x$OPENJDK_TARGET_CPU" = xppc64le; then
++ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DABI_ELFv2"
++ fi
+ if test "x$OPENJDK_TARGET_OS" = xlinux; then
+ COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DLINUX"
+ fi
diff --git a/sources b/sources
index 0a6bbc4..34cf8d8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) =
cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
-SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b13.tar.xz) =
56fc01edf3c8a7f7ad5af719983837d70efa10877b066ab4021cb8e753cf9edfd8c86433e9b04e859f09478d98533fca06360a0ee0d58c17e3405b737c77689a
+SHA512 (aarch64-port-jdk8u-shenandoah-aarch64-shenandoah-jdk8u191-b14.tar.xz) =
d2f3e618bf8fa8d8991f2db32b665d52170642fd375926f84b0cc40a7896278847f6374fcb6d095f681b72a170ac7189ec3501907c5ca0d3d454a09397eedcfa