From b2a4fc56eec03b28ccc2f79470b2c363c68f6da7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 21 2016 12:25:26 +0000 Subject: import java-1.7.0-openjdk-1.7.0.101-2.6.6.1.el7_2 --- diff --git a/.gitignore b/.gitignore index 48c4eea..3ae7c43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/class-rewriter.tar.gz -SOURCES/openjdk-icedtea-2.6.5.tar.xz +SOURCES/openjdk-icedtea-2.6.6.tar.xz SOURCES/pulseaudio.tar.gz SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/.java-1.7.0-openjdk.metadata b/.java-1.7.0-openjdk.metadata index a83d005..c4cd49a 100644 --- a/.java-1.7.0-openjdk.metadata +++ b/.java-1.7.0-openjdk.metadata @@ -1,4 +1,4 @@ fcc167de17354efb6e52cb387eb3e7dbb0316b53 SOURCES/class-rewriter.tar.gz -28cbb27d7d6fe350cd1a2243b2f3cbafcecdb223 SOURCES/openjdk-icedtea-2.6.5.tar.xz +661f1b17eefd2f5cabb74aefb8a0efa0bd9c41a0 SOURCES/openjdk-icedtea-2.6.6.tar.xz fb72b6b1f4735ad9b5799d0b5058b0b1dec67b17 SOURCES/pulseaudio.tar.gz becc037bf0eb13b5f0ebcdd94b58ebfe6336b7a0 SOURCES/systemtap-tapset-2014-03-19.tar.xz diff --git a/SOURCES/fontpath.patch b/SOURCES/fontpath.patch new file mode 100644 index 0000000..2ee711b --- /dev/null +++ b/SOURCES/fontpath.patch @@ -0,0 +1,11 @@ +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 +@@ -1075,7 +1075,6 @@ + } + } + } +- (*env)->ReleaseStringUTFChars (env, fcNameStr, (const char*)fcName); + FcFontSetDestroy (fontset); + FcPatternDestroy (pattern); + free(family); diff --git a/SOURCES/ttable_match_7.patch b/SOURCES/ttable_match_7.patch new file mode 100644 index 0000000..0e14a67 --- /dev/null +++ b/SOURCES/ttable_match_7.patch @@ -0,0 +1,16 @@ +diff -r bca222181d07 src/cpu/ppc/vm/templateTable_ppc_64.cpp +--- openjdk/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp Mon Apr 18 07:12:53 2016 +0100 ++++ openjdk/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp Mon Apr 18 08:26:52 2016 +0100 +@@ -2898,9 +2898,10 @@ + __ stbx(R17_tos, Rclass_or_obj, Roffset); + if (!is_static) { patch_bytecode(Bytecodes::_fast_zputfield, Rbc, Rscratch, true, byte_no); } + if (!support_IRIW_for_not_multiple_copy_atomic_cpu) { +- __ beq(CR_is_vol, Lvolatile); // Volatile? ++ __ bne(CR_is_vol, Lexit); // Non-volatile? ++ __ fence(); + } +- __ dispatch_epilog(vtos, Bytecodes::length_for(bytecode())); ++ __ b(Lexit); + + __ align(32, 28, 28); // Align pop. + // __ bind(Lctos); diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 18c7a32..ee05325 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -5,7 +5,7 @@ # conflicting) files in the -debuginfo package %undefine _missing_build_ids_terminate_build -%global icedtea_version 2.6.5 +%global icedtea_version 2.6.6 %global hg_tag icedtea-{icedtea_version} %global aarch64 aarch64 arm64 armv8 @@ -91,7 +91,11 @@ # If hsbootstrap is 1, build HotSpot alone first and use that in the bootstrap JDK # You can turn this on to avoid issues where HotSpot is broken in the bootstrap JDK +%ifarch %{jit_arches} +%global hsbootstrap 1 +%else %global hsbootstrap 0 +%endif %if %{debug} %global buildoutputdir openjdk/build/linux-%{archbuild}-debug @@ -126,10 +130,10 @@ # Standard JPackage naming and versioning defines. %global origin openjdk -%global updatever 99 +%global updatever 101 %global buildver 00 # Keep priority on 7digits in case updatever>9 -%global priority 17000%{updatever} +%global priority 1700%{updatever} %global javaver 1.7.0 %global sdkdir %{uniquesuffix} @@ -168,7 +172,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.0%{?dist} +Release: %{icedtea_version}.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 @@ -271,6 +275,11 @@ Patch300: pulse-soundproperties.patch Patch400: rh1022017.patch # Temporary patches +# Match ztos handling in templateTable_ppc_64.cpp to others in 7 +Patch501: ttable_match_7.patch + +Patch666: fontpath.patch + # End of tmp patches BuildRequires: autoconf @@ -502,7 +511,8 @@ cp %{SOURCE2} . # ECC fix %patch400 -# Temporary fixes +# Temporary patches +%patch501 # End of temporary fixes # Add systemtap patches if enabled @@ -554,6 +564,8 @@ tar xzf %{SOURCE9} %patch106 %patch200 +%patch666 + %build # How many cpu's do we have? export NUM_PROC=`/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :` @@ -726,7 +738,7 @@ make \ UNLIMITED_CRYPTO=true \ ANT="/usr/bin/ant" \ DISTRO_NAME="Red Hat Enterprise Linux 7" \ - DISTRO_PACKAGE_VERSION="rhel-%{release}-%{_arch} u%{updatever}-b%{buildver}" \ + DISTRO_PACKAGE_VERSION="${PKGVERSION}" \ JDK_UPDATE_VERSION=`printf "%02d" %{updatever}` \ JDK_BUILD_NUMBER=b`printf "%02d" %{buildver}` \ JRE_RELEASE_VERSION=%{javaver}_`printf "%02d" %{updatever}`-b`printf "%02d" %{buildver}` \ @@ -1542,6 +1554,29 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog +* Tue Apr 19 2016 Jiri Vanek - 1:1.7.0.101-2.6.6.1 +- added Patch666 fontpath.patch to fix tck regressions +- Resolves: rhbz#1325427 + +* Mon Apr 18 2016 Andrew Hughes - 1:1.7.0.101-2.6.6.0 +- Fix ztos handling in templateTable_ppc_64.cpp to be same as others in 7. +- Resolves: rhbz#1325427 + +* Mon Apr 18 2016 Andrew Hughes - 1:1.7.0.101-2.6.6.0 +- Bump to 2.6.6 and u101b00. +- Drop AArch64 patch (PR2914) included in 2.6.6 +- Drop a leading zero from the priority as the update version is now three digits +- Update PR2809 patch to apply against 2.6.6. +- Resolves: rhbz#1325427 + +* Wed Apr 06 2016 Andrew Hughes - 1:1.7.0.99-2.6.5.1 +- Replace 8146709 backout with fix from Andrew Haley +- Resolves: rhbz#1320658 + +* Tue Apr 05 2016 Andrew Hughes - 1:1.7.0.99-2.6.5.1 +- Backout 8146709 to try and fix build on AArch64 +- Resolves: rhbz#1320658 + * Thu Mar 24 2016 Andrew Hughes - 1:1.7.0.99-2.6.5.0 - Bump to 2.6.5 and u99b00. - Correct check for fsg.sh in tarball creation script