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

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

diff --git a/extra/java8-openjdk-aarch64/PKGBUILD b/extra/java8-openjdk-aarch64/PKGBUILD
index 9ec4c9e8b..cdd146c93 100644
--- a/extra/java8-openjdk-aarch64/PKGBUILD
+++ b/extra/java8-openjdk-aarch64/PKGBUILD
@@ -19,7 +19,7 @@ _jdk_build=07
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=aarch64-shenandoah-jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
 _jdk8u_repo_ver=shenandoah-aarch64-shenandoah-jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='https://openjdk.java.net/'
 license=('custom')
@@ -37,7 +37,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=('c8edffa803b996b0f7bc1d544a051142ee451eabad340429af225d3a0bd115c2'
             'd249ea857042ff8b9637a077ca0cd0f104dae0ac4d158b4bf8d4da463e7046a6'
             '31ccd5aa4e73282c2cd377e60915e100fa9794a3a8d07c26ba348635c59fa726'
@@ -87,8 +87,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 \