diff --git a/SPECS/java-1.7.0-openjdk.spec b/SPECS/java-1.7.0-openjdk.spec index 9e25745..c80e768 100644 --- a/SPECS/java-1.7.0-openjdk.spec +++ b/SPECS/java-1.7.0-openjdk.spec @@ -116,7 +116,7 @@ # 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 0 +%global hsbootstrap 1 %else %global hsbootstrap 0 %endif @@ -194,7 +194,7 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever} -Release: %{icedtea_version}.0%{?dist} +Release: %{icedtea_version}.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 @@ -306,7 +306,6 @@ Patch500: pr2809.patch Patch501: pr3393-rh1273760.patch # 8197981: Missing return statement in __sync_val_compare_and_swap_8 Patch502: 8197981.patch - # End of tmp patches BuildRequires: autoconf @@ -622,11 +621,19 @@ export NUM_PROC=${NUM_PROC:-1} export ARCH_DATA_MODEL=64 %endif %ifarch alpha -export CFLAGS="$CFLAGS -mieee" +%global archflags "-mieee" %endif -CFLAGS="$CFLAGS -fstack-protector-strong" -export CFLAGS +# Filter out flags from the optflags macro that cause problems with the OpenJDK build +# We filter out -O flags so that the optimisation of HotSpot is not lowered from O3 to O2 +# We filter out -Wall which will otherwise cause HotSpot to produce hundreds of thousands of warnings (100+mb logs) +# We replace it with -Wformat (required by -Werror=format-security) and -Wno-cpp to avoid FORTIFY_SOURCE warnings +# We filter out -fexceptions as the HotSpot build explicitly does -fno-exceptions and it's otherwise the default for C++ +%global ourflags %(echo %optflags | sed -e 's|-Wall|-Wformat=2 -Wno-cpp -Wno-error=format-nonliteral|') +# Disable RPM CFLAGS for now as the change appears to cause crashes on x86 RHEL 7.5 multilib +#%global ourcppflags %(echo %ourflags | sed -e 's|-fexceptions||' | sed -r -e 's|-O[0-9]*||') +%global ourcppflags "-fstack-protector-strong" +%global ourldflags %{__global_ldflags} # Build the re-written rhino jar mkdir -p rhino/{old,new} @@ -765,6 +772,7 @@ make \ SYSTEM_GSETTINGS="true" \ BUILD_JAXP=false BUILD_JAXWS=false BUILD_LANGTOOLS=false BUILD_JDK=false BUILD_CORBA=false \ ALT_JDK_IMPORT_PATH=${JDK_TO_BUILD_WITH} ALT_OUTPUTDIR=${PWD}/bootstrap \ + EXTRA_CFLAGS="%{ourcppflags}" EXTRA_LDFLAGS="%{ourldflags}" \ %{debugbuild} export VM_DIR=bootstrap-vm/jre/lib/%{archinstall}/server @@ -806,6 +814,7 @@ make \ NSS_CFLAGS="%{NSS_CFLAGS}" \ ECC_JUST_SUITE_B="true" \ SYSTEM_GSETTINGS="true" \ + EXTRA_CFLAGS="%{ourcppflags}" EXTRA_LDFLAGS="%{ourldflags}" \ %{debugbuild} popd >& /dev/null @@ -1469,57 +1478,118 @@ exit 0 %{_jvmdir}/%{jredir}/lib/accessibility.properties %changelog -* Thu Feb 15 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.0 -- Fix missing return statement in src/os_cpu/linux_zero/vm/os_linux_zero.cpp (non-LP64 only) +* Wed Feb 21 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.2 +- Remove archflags for now. +- Resolves: rhbz#1528233 + +* Wed Feb 21 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.2 +- Make archflags inclusion conditional. +- Resolves: rhbz#1528233 + +* Wed Feb 21 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.2 +- Only define archflags when needed +- Resolves: rhbz#1528233 + +* Wed Feb 21 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.2 +- Get rid of troublesome CFLAGS altogether. - Resolves: rhbz#1528233 -* Thu Feb 15 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.0 +* Wed Feb 21 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.2 +- Leading spaces due to empty CFLAGS causes build error +- Resolves: rhbz#1528233 + +* Wed Feb 21 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.2 +- Rebuild with RPM optimisation flags disabled due to issues on x86 multilib +- Resolves: rhbz#1528233 + +* Thu Feb 15 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.1 +- Spoke too soon... fix missing return statement in src/os_cpu/linux_zero/vm/os_linux_zero.cpp (non-LP64 only) +- Resolves: rhbz#1528233 + +* Thu Feb 15 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.1 - Update to new tarball with AArch64 return value fixes, dropping local patch. +- Drop -Wno-error=return-type now they appear to be fixed. - Resolves: rhbz#1528233 -* Wed Feb 14 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.0 +* Wed Feb 14 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.1 - Extend pr3393-rh1273760.patch so Token.getMechanismInfo can handle CK_MECHANISM +- Fix missing return statement in hotspot/src/cpu/aarch64/vm/vm_version_aarch64.cpp +- Resolves: rhbz#1528233 + +* Tue Feb 13 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.1 +- Fix missing return statement in hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +- Temporarily add -Wno-error=return-type so we can catch them all. - Resolves: rhbz#1528233 -* Tue Feb 13 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.0 +* Tue Feb 13 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.1 +- Fix missing return statement in hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp. +- Resolves: rhbz#1528233 + +* Tue Feb 13 2018 Andrew Hughes - 1:1.7.0.171-2.6.13.1 - Bump to 2.6.13 and u171b01. - Update java-1.7.0-openjdk-java-access-bridge-security.patch to apply after 8186080 - Drop PR3497 AArch64 patch now applied upstream. - Update RC4 patch (8076221/PR2809) to apply after 8148108 (DH lower limit increase) -- Fix file path in rh1022017.patch. - Resolves: rhbz#1528233 -* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.0 +* Tue Feb 13 2018 Andrew Hughes - 1:1.7.0.161-2.6.12.2 +- Turn off -Werror for format-nonliteral +- Resolves: rhbz#1528233 + +* Tue Feb 13 2018 Andrew Hughes - 1:1.7.0.161-2.6.12.2 +- Need to quote ourcppflags/ourldflags so as not to break on spaces. +- Add flags to both make invocations. +- Drop -fstack-protector-strong addition as provided by distro. +- Resolves: rhbz#1528233 + +* Tue Feb 13 2018 Andrew Hughes - 1:1.7.0.161-2.6.12.2 +- Use distro build flags as we do for OpenJDK 8. +- Resolves: rhbz#1528233 + +* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.1 +- Turn on hsbootstrap for JIT arches +- Resolves: rhbz#1499207 + +* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.1 - Remove superfluous %%1 from policy JAR file path. - Resolves: rhbz#1499207 -* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.0 +* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.1 - Add missing implementation of Matcher::pass_original_key_for_aes() on AArch64 (PR3497) - Resolves: rhbz#1499207 -* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.0 +* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.1 - Update location of policy JAR files following 8157561. - Resolves: rhbz#1499207 -* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.0 +* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.1 - Fix name of SystemTap tarball, following update. - Resolves: rhbz#1499207 -* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.0 +* Tue Nov 28 2017 Andrew Hughes - 1:1.7.0.161-2.6.12.1 - Bump to 2.6.12 and u161b00. - Update SystemTap tapsets to version in IcedTea 2.6.12pre01 to fix RH1492139. -- Drop 8185716 patch, now applied upstream. +- Drop 8185716, 8145438, 8138745 and 8075484 patches, all applied upstream. - Update location of OpenJDK zlib system library source code in remove-intree-libraries.sh - Resolves: rhbz#1499207 -* Wed Aug 02 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.1 -- Apply fix for 8185716 so ppc uses correct ins_encode format -- Resolves: rhbz#1466509 +* Thu Oct 26 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.4 +- Add backport of 8075484/PR3473/RH1490713 (SocketInputStream.socketRead0 hang) +- Resolves: rhbz#1490713 -* Wed Aug 02 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.1 +* Thu Oct 26 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.4 +- Add backport of 8138745/PR3465/RH1484399 (-XX:+ExitOnOutOfMemoryError) +- Resolves: rhbz#1484399 + +* Thu Oct 26 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.3 +- Fix crashing virtual machine ("Field too big for insn") on AArch64 +- Resolves: rhbz#1482244 + +* Wed Aug 02 2017 Andrew Hughes - 1:1.7.0.151-2.6.11.2 - Bump to 2.6.11 and u151b00. - Update java-access-bridge-security.patch to apply against 2.6.11. - Drop 7177216 merge fix which is applied upstream. +- Apply fix for 8185716 so ppc uses correct ins_encode format - Resolves: rhbz#1466509 * Tue Jun 13 2017 Jiri Vanek - 1:1.7.0.141-2.6.10.5