From 8365b832208614b3980d61b39028c42d96db9cc2 Mon Sep 17 00:00:00 2001
From: David Beauchamp <david@archlinuxarm.org>
Date: Fri, 24 Dec 2021 11:48:58 -0500
Subject: [PATCH] extra/java8-openjdk to 8.u312-2

---
 extra/java8-openjdk/PKGBUILD | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD
index b553d15e2..6310a8ed7 100644
--- a/extra/java8-openjdk/PKGBUILD
+++ b/extra/java8-openjdk/PKGBUILD
@@ -18,7 +18,7 @@ _jdk_update=312
 _jdk_build=10
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-ga
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
@@ -36,7 +36,7 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
         nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
         gcc11.patch
         8143245-pr3548.patch)
-
+options=(!lto)
 sha256sums=('c10d984ab561f9e9733c313432e0da88bed9cde5202b462bc73cfe488fc65328'
             '0a66933a2d7011eece138ca1e8d3db584335c711463092c79ada638c825c41d1'
             '1bef21655dae14e1964c14add6c23c6c2f555a79e269a3bfe06e8a8d2a23fd0a'
@@ -85,8 +85,9 @@ build() {
   export MAKEFLAGS=${MAKEFLAGS/-j*}
 
   # Avoid optimization of HotSpot being lowered from O3 to O2
-  export CFLAGS="${CFLAGS//-O2/-O3} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -Wno-error=format-overflow="
-  export CXXFLAGS="${CXXFLAGS} -fcommon"
+  # -fno-exceptions for FS#73134
+  export CFLAGS="${CFLAGS//-O2/-O3} -Wno-error=nonnull -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -fno-exceptions -Wno-error=format-overflow="
+  export CXXFLAGS="${CXXFLAGS} -fcommon -fno-exceptions"
 
   install -d -m 755 "${srcdir}/${_prefix}/"
   sh configure \