Mercurial > hg > icedtea8
changeset 2826:d4671962cbd5 icedtea-3.8.0pre02
PR3594: Patch for bug 3593 breaks Shenandoah build
2018-05-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR3594: Patch for bug 3593 breaks Shenandoah build
* Makefile.am:
(ICEDTEA_PATCHES): Add all build HotSpot patches
after the conditional patches.
* NEWS: Updated.
| author | andrew |
|---|---|
| date | Fri, 25 May 2018 02:01:14 +0100 |
| parents | 96c3f96d8754 |
| children | 2828a754f6e9 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun May 20 14:40:56 2018 +0100 +++ b/ChangeLog Fri May 25 02:01:14 2018 +0100 @@ -1,3 +1,11 @@ +2018-05-21 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR3594: Patch for bug 3593 breaks Shenandoah build + * Makefile.am: + (ICEDTEA_PATCHES): Add all build HotSpot patches + after the conditional patches. + * NEWS: Updated. + 2018-05-19 Andrew John Hughes <gnu_andrew@member.fsf.org> S8197981, PR3548: Missing return statement
--- a/Makefile.am Sun May 20 14:40:56 2018 +0100 +++ b/Makefile.am Fri May 25 02:01:14 2018 +0100 @@ -344,9 +344,7 @@ ICEDTEA_PATCHES = \ patches/override-redirect-metacity.patch \ - patches/pr3591.patch \ - patches/pr3593.patch \ - patches/pr3548.patch + patches/pr3591.patch # Conditional patches @@ -446,6 +444,11 @@ endif endif +# Apply additional HotSpot patches against same patch base +ICEDTEA_PATCHES += \ + patches/pr3593.patch \ + patches/pr3548.patch + ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) # Bootstrapping patches
--- a/NEWS Sun May 20 14:40:56 2018 +0100 +++ b/NEWS Fri May 25 02:01:14 2018 +0100 @@ -93,6 +93,7 @@ - PR3575, RH1567204: System cacerts database handling should not affect jssecacerts - PR3592: Skip AES test on AArch64 due to VM crash - PR3593: s390 needs to use '%z' format specifier for size_t arguments as size_t != int + - PR3594: Patch for bug 3593 breaks Shenandoah build * Shenandoah - PR3573: Fix TCK crash with Shenandoah - Remove oop cast in oopMap.cpp again, as oopDesc::operator== has additional checking in Shenandoah.