From e89e0de58b52ec24ab3de16f4d0bc21b42ca1d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sat, 13 Aug 2022 21:22:38 +0100
Subject: [PATCH] try -O1 for s390x for now

---
 ...try-making-s390x-bridge-source-noopt.patch | 26 -------------------
 libreoffice.spec                              |  9 ++++++-
 2 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 0001-try-making-s390x-bridge-source-noopt.patch

diff --git a/0001-try-making-s390x-bridge-source-noopt.patch b/0001-try-making-s390x-bridge-source-noopt.patch
deleted file mode 100644
index 3b3a916..0000000
--- a/0001-try-making-s390x-bridge-source-noopt.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7158218227c9b436eb4a17c005272fb06da1c2f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Sat, 13 Aug 2022 16:02:30 +0100
-Subject: [PATCH] try making s390x bridge source noopt
-
-Change-Id: I344812ae4fa9fe085c6b195d2b0e87e9267062cb
----
- bridges/Library_cpp_uno.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
-index e2de3c1678b4..7b2cd3d1301f 100644
---- a/bridges/Library_cpp_uno.mk
-+++ b/bridges/Library_cpp_uno.mk
-@@ -145,7 +145,7 @@ else ifeq ($(CPUNAME),S390X)
- 
- ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
- bridges_SELECTED_BRIDGE := gcc3_linux_s390x
--bridge_exception_objects := cpp2uno except uno2cpp
-+bridge_noopt_objects := cpp2uno except uno2cpp
- endif
- 
- else ifeq ($(CPUNAME),SPARC)
--- 
-2.37.1
-
diff --git a/libreoffice.spec b/libreoffice.spec
index 4b58e89..2226533 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -267,7 +267,6 @@ Patch7: 0001-turn-off-font-combobox-preview-if-SAL_ABORT_ON_NON_A.patch
 Patch8: 0001-Arial-Narrow-Liberation-Sans-Narrow.patch
 Patch9: 0001-don-t-worry-about-Linux-Libertine-O-vs-Linux-Liberti.patch
 Patch10: 0001-fix-various-glyph-substitution-asserts-when-using-wi.patch
-Patch11: 0001-try-making-s390x-bridge-source-noopt.patch
 # not upstreamed
 Patch500: 0001-disable-libe-book-support.patch
 
@@ -1037,6 +1036,14 @@ for i in $RPM_OPT_FLAGS; do
         case "$i" in
                 -pipe|-Wall|-Werror*|-fexceptions) continue;;
         esac
+%ifarch s390x
+        # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106355
+        case "$i" in
+                -O2)
+                ARCH_FLAGS="$ARCH_FLAGS -O1"
+                continue;;
+        esac
+%endif
         ARCH_FLAGS="$ARCH_FLAGS $i"
 done
 %ifarch s390 %{arm} aarch64