# HG changeset patch # User Andrew John Hughes # Date 1563390323 -3600 # Node ID 3b183ba4a3a38f155719602aa5f400aedfad2a82 # Parent fccb67cea9593c831bf61b98e27058036e33af51 PR3744: Latest ISO 4217 amendments make Classpath bug #64174 workaround redundant 2019-07-17 Andrew John Hughes PR3744: Latest ISO 4217 amendments make Classpath bug #64174 workaround redundant * patches/boot/pr64174.patch: Removed. * Makefile.am: (ICEDTEA_BOOT_PATCHES): No longer apply pr64174.patch * NEWS: Updated. * acinclude.m4: (IT_PR64174_CHECK): Remove macro. * configure.ac: Don't invoke IT_PR64174_CHECK. diff -r fccb67cea959 -r 3b183ba4a3a3 ChangeLog --- a/ChangeLog Wed Jul 17 16:53:58 2019 +0100 +++ b/ChangeLog Wed Jul 17 20:05:23 2019 +0100 @@ -1,3 +1,16 @@ +2019-07-17 Andrew John Hughes + + PR3744: Latest ISO 4217 amendments make + Classpath bug #64174 workaround redundant + * patches/boot/pr64174.patch: Removed. + * Makefile.am: + (ICEDTEA_BOOT_PATCHES): No longer apply + pr64174.patch + * NEWS: Updated. + * acinclude.m4: + (IT_PR64174_CHECK): Remove macro. + * configure.ac: Don't invoke IT_PR64174_CHECK. + 2019-07-16 Andrew John Hughes Bump to 2.6.19. diff -r fccb67cea959 -r 3b183ba4a3a3 Makefile.am --- a/Makefile.am Wed Jul 17 16:53:58 2019 +0100 +++ b/Makefile.am Wed Jul 17 20:05:23 2019 +0100 @@ -535,13 +535,6 @@ ICEDTEA_BOOT_PATCHES += patches/boot/use_target_6_for_bootstrap_classes.patch endif -# If date parsing bug is present, move Lithuania EUR transition date -# two hours forward into 1st of January, 2015 and drop Latvia transition -# date as it's already in the past. -if CP64174 -ICEDTEA_BOOT_PATCHES += patches/boot/pr64174.patch -endif - ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES) # OpenJDK build environment. diff -r fccb67cea959 -r 3b183ba4a3a3 NEWS --- a/NEWS Wed Jul 17 16:53:58 2019 +0100 +++ b/NEWS Wed Jul 17 20:05:23 2019 +0100 @@ -64,6 +64,7 @@ - S8225580: tzdata2018i integration causes test failures on jdk-13 * Bug fixes - PR3729: CVE-2018-3639 fix revision to prefer PR_SPEC_DISABLE_NOEXEC to PR_SPEC_DISABLE + - PR3744: Latest ISO 4217 amendments make PR64174 workaround redundant * AArch64 port - S8149365, PR3741: aarch64: memory copy does not prefetch on backwards copy - S8151340, PR3741: aarch64: prefetch the destination word for write prior to ldxr/stxr loops. diff -r fccb67cea959 -r 3b183ba4a3a3 acinclude.m4 --- a/acinclude.m4 Wed Jul 17 16:53:58 2019 +0100 +++ b/acinclude.m4 Wed Jul 17 20:05:23 2019 +0100 @@ -2988,52 +2988,6 @@ AM_CONDITIONAL([ENABLE_QUEENS], test x"${enable_queens}" = "xyes") ]) -AC_DEFUN_ONCE([IT_PR64174_CHECK],[ -AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) -AC_CACHE_CHECK([if java.text.SimpleDateFormat exhibits Classpath bug 64174], it_cv_cp64174, [ - CLASS=Test.java - BYTECODE=$(echo $CLASS|sed 's#\.java##') - mkdir tmp.$$ - cd tmp.$$ - cat << \EOF > $CLASS -[/* [#]line __oline__ "configure" */ -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Locale; -import java.util.TimeZone; - -public class Test -{ - public static void main(String[] args) - throws ParseException - { - SimpleDateFormat format; - - format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US); - format.setTimeZone(TimeZone.getTimeZone("GMT")); - format.setLenient(false); - System.out.println(format.parse("2014-12-31-22-00-00")); - } -}] -EOF - if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then - if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then - it_cv_cp64174=no; - else - it_cv_cp64174=yes; - fi - else - it_cv_cp64174=yes; - fi - rm -f $CLASS *.class - cd .. - rmdir tmp.$$ - ]) -AM_CONDITIONAL([CP64174], test x"${it_cv_cp64174}" = "xyes") -AC_PROVIDE([$0])dnl -]) - AC_DEFUN([IT_UNDERSCORE_CHECK],[ AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) AC_CACHE_CHECK([if the Java compiler lacks support for underscored literals], it_cv_underscore, [ diff -r fccb67cea959 -r 3b183ba4a3a3 configure.ac --- a/configure.ac Wed Jul 17 16:53:58 2019 +0100 +++ b/configure.ac Wed Jul 17 20:05:23 2019 +0100 @@ -159,9 +159,6 @@ dnl Check whether the OpenJDK tooling is present in the bootstrap JDK, required by CORBA IT_CHECK_FOR_CLASS([SUN_TOOLS_JAVA_CLASSDEFINITION], [sun.tools.java.ClassDefinition]) -dnl Check whether the JDK can parse the dates used in the currency file -IT_PR64174_CHECK - IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK IT_UNDERSCORE_CHECK diff -r fccb67cea959 -r 3b183ba4a3a3 patches/boot/pr64174.patch --- a/patches/boot/pr64174.patch Wed Jul 17 16:53:58 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties ---- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:09:06.030312835 +0000 -+++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:10:07.527160626 +0000 -@@ -320,7 +320,7 @@ - # LAO PEOPLE'S DEMOCRATIC REPUBLIC - LA=LAK - # LATVIA --LV=LVL;2013-12-31-22-00-00;EUR -+LV=EUR - # LEBANON - LB=LBP - # LESOTHO -@@ -332,7 +332,7 @@ - # LIECHTENSTEIN - LI=CHF - # LITHUANIA --LT=LTL;2014-12-31-22-00-00;EUR -+LT=LTL;2015-01-01-00-00-00;EUR - # LUXEMBOURG - LU=EUR - # MACAU