Architecture specific change in rpms/ghc.git

The package rpms/ghc.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ghc.git/commit/?id=204697fda0ea1fe31....

Change:
+%ifarch s390x

Thanks.

Full change:
============

commit f3741279b306a52c893e92474c7d605c1451eee5
Author: Jens Petersen 
Date:   Sat Nov 25 09:58:52 2023 +0800

BR ghc-*-devel instead of ghc-*-static

diff --git a/ghc.spec b/ghc.spec
index 9e2cd13..becb44d 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -197,20 +197,20 @@ BuildRequires: elfutils-devel
 # needed for binary-dist-dir
 BuildRequires:  autoconf automake
 %if %{with build_hadrian}
-BuildRequires:  ghc-Cabal-static
-BuildRequires:  ghc-QuickCheck-static
-BuildRequires:  ghc-base-static
-BuildRequires:  ghc-bytestring-static
-BuildRequires:  ghc-containers-static
-BuildRequires:  ghc-directory-static
-BuildRequires:  ghc-extra-static
-BuildRequires:  ghc-filepath-static
-BuildRequires:  ghc-mtl-static
-BuildRequires:  ghc-parsec-static
-BuildRequires:  ghc-shake-static
-BuildRequires:  ghc-stm-static
-BuildRequires:  ghc-transformers-static
-BuildRequires:  ghc-unordered-containers-static
+BuildRequires:  ghc-Cabal-devel
+BuildRequires:  ghc-QuickCheck-devel
+BuildRequires:  ghc-base-devel
+BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-extra-devel
+BuildRequires:  ghc-filepath-devel
+BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-parsec-devel
+BuildRequires:  ghc-shake-devel
+BuildRequires:  ghc-stm-devel
+BuildRequires:  ghc-transformers-devel
+BuildRequires:  ghc-unordered-containers-devel
 %else
 BuildRequires:  %{name}-hadrian
 %endif

commit 204697fda0ea1fe314373a382cccb7b0a26b6649
Author: Jens Petersen 
Date:   Sat Nov 25 09:58:41 2023 +0800

s390x: patch from @stefansf (IBM) to fix llvm alignment of data sections

diff --git a/11662.patch b/11662.patch
new file mode 100644
index 0000000..ce6ca44
--- /dev/null
+++ b/11662.patch
@@ -0,0 +1,31 @@
+From bed85f7bc358fdca4677a3070b94ea544bb9e7ff Mon Sep 17 00:00:00 2001
+From: Stefan Schulze Frielinghaus 
+Date: Mon, 27 Nov 2023 12:34:47 +0100
+Subject: [PATCH] llvmGen: Align objects in the data section
+
+Objects in the data section may be referenced via tagged pointers.
+Thus, align those objects to a 4- or 8-byte boundary for 32- or 64-bit
+platforms, respectively.  Note, this may need to be reconsidered if
+objects with a greater natural alignment requirement are emitted as e.g.
+128-bit atomics.
+
+Fixes #24163.
+---
+ compiler/GHC/CmmToLlvm/Data.hs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/compiler/GHC/CmmToLlvm/Data.hs b/compiler/GHC/CmmToLlvm/Data.hs
+index caac121413c..5e8912e3bc7 100644
+--- a/compiler/GHC/CmmToLlvm/Data.hs
++++ b/compiler/GHC/CmmToLlvm/Data.hs
+@@ -89,6 +89,7 @@ genLlvmData (sec, CmmStaticsRaw lbl xs) = do
+         align          = case sec of
+                             Section CString _ -> if (platformArch platform == ArchS390X)
+                                                     then Just 2 else Just 1
++                            Section Data _    -> Just $ platformWordSizeInBytes platform
+                             _                 -> Nothing
+         const          = if sectionProtection sec == ReadOnlySection
+                             then Constant else Global
+-- 
+GitLab
+
diff --git a/ghc.spec b/ghc.spec
index fed7508..9e2cd13 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -87,7 +87,7 @@ Version: 9.4.5
 # - release can only be reset if *all* library versions get bumped simultaneously
 #   (sometimes after a major release)
 # - minor release numbers for a branch should be incremented monotonically
-Release: 136%{?dist}
+Release: 137%{?dist}
 Summary: Glasgow Haskell Compiler

License: BSD-3-Clause AND HaskellReport
@@ -133,6 +133,11 @@ Patch13: text2-allow-ghc8-arm.patch
 Patch15: ghc-warnings.mk-CC-Wall.patch
 Patch16: ghc-hadrian-s390x-rts--qg.patch

+# s390x
+# https://gitlab.haskell.org/ghc/ghc/-/issues/24163
+# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11662
+Patch17: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11662.patch
+
 # Debian patches:
 Patch24: buildpath-abi-stability.patch
 Patch26: no-missing-haddock-file-warning.patch
@@ -454,6 +459,10 @@ rm libffi-tarballs/libffi-*.tar.gz
 %patch -P16 -p1 -b .orig
 %endif

+%ifarch s390x
+%patch -P17 -p1 -b .orig
+%endif
+
 #debian
 #%%patch -P24 -p1 -b .orig
 %patch -P26 -p1 -b .orig
@@ -1005,6 +1014,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index

%changelog
+* Sat Nov 25 2023 Jens Petersen  - 9.4.5-137
+- s390x: patch from @stefansf (IBM) to fix llvm alignment in data sections
+  which should fix certain runtime crashes (#2248097)
+
 * Mon Sep 11 2023 Jens Petersen  - 9.4.5-136
 - sync with ghc9.4: add sphinx7 patch
 - user_guide: update external links patch in line with final upstream

commit af12036cab473c67685db60e7156cb2ee0dc257f
Author: Jens Petersen 
Date:   Mon Sep 11 14:08:22 2023 +0800

changelog for sphinx7 and external links tweak

diff --git a/ghc.spec b/ghc.spec
index 1ae6bb6..fed7508 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -87,7 +87,7 @@ Version: 9.4.5
 # - release can only be reset if *all* library versions get bumped simultaneously
 #   (sometimes after a major release)
 # - minor release numbers for a branch should be incremented monotonically
-Release: 135%{?dist}
+Release: 136%{?dist}
 Summary: Glasgow Haskell Compiler

License: BSD-3-Clause AND HaskellReport
@@ -1005,6 +1005,10 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index

%changelog
+* Mon Sep 11 2023 Jens Petersen  - 9.4.5-136
+- sync with ghc9.4: add sphinx7 patch
+- user_guide: update external links patch in line with final upstream
+
 * Tue Aug  8 2023 Jens Petersen  - 9.4.5-135
 - disable ghc9.4 obsoletes due to 9.4.6 release

commit 24eeb06d7d5ebdf9458d8c8bb3861a7a5578f292
Author: Jens Petersen 
Date:   Mon Sep 11 14:03:30 2023 +0800

tweak a couple of comments

diff --git a/ghc.spec b/ghc.spec
index f60e9e3..1ae6bb6 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -17,7 +17,7 @@
 %undefine with_haddock
 %endif

-# use Hadrian buildsystem for production builds
+# use Hadrian buildsystem for production builds: seems redundant
 %bcond hadrian 1

# disabled to allow parallel install of ghcX.Y-X.Y.(Z+1) and ghc-X.Y.Z
@@ -449,7 +449,6 @@ rm libffi-tarballs/libffi-*.tar.gz
 %patch -P13 -p1 -b .orig
 %endif

-# remove s390x after complete switching to llvm
 %ifarch %{ghc_unregisterized_arches}
 %patch -P15 -p1 -b .orig
 %patch -P16 -p1 -b .orig

commit afd169846dc70049ccf75c3e2c1169ac63b90a91
Author: Jens Petersen 
Date:   Mon Sep 11 14:00:31 2023 +0800

sync ghc9.4: add sphinx7 patch

diff --git a/ghc.spec b/ghc.spec
index 206b08b..f60e9e3 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -1,5 +1,5 @@
 # Start: prod settings
-# all bcond_without for production builds:
+# all *bcond_without* for production builds:
 # - performance build (disable for quick build)
 %bcond perfbuild 1
 %bcond build_hadrian 1
@@ -9,7 +9,7 @@
 %endif
 # End: prod settings

-# without for production builds
+# not for production builds
 %if %{without perfbuild}
 # disable profiling libraries (overriding macros.ghc-srpm)
 %undefine with_ghc_prof
@@ -138,6 +138,10 @@ Patch24: buildpath-abi-stability.patch
 Patch26: no-missing-haddock-file-warning.patch
 Patch27: haddock-remove-googleapis-fonts.patch

+Patch30: https://src.opensuse.org/rpm/ghc/raw/branch/factory/sphinx7.patch
+
+# https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
+
 # fedora ghc has been bootstrapped on
 # %%{ix86} x86_64 s390x ppc64le aarch64
 # and retired arches: alpha sparcv9 armv5tel ppc ppc64 s390 armv7hl
@@ -456,6 +460,11 @@ rm libffi-tarballs/libffi-*.tar.gz
 %patch -P26 -p1 -b .orig
 %patch -P27 -p1 -b .orig

+#sphinx 7
+%if 0%{?fedora} >= 40
+%patch -P30 -p1 -b .orig
+%endif
+
 %if %{with haddock} && %{without hadrian}
 %global gen_contents_index gen_contents_index.orig
 if [ ! -f "libraries/%{gen_contents_index}" ]; then
@@ -465,7 +474,6 @@ fi
 %endif

%if %{without hadrian}
-# https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
 cat > mk/build.mk << EOF
 %if %{with perfbuild}
 %ifarch %{ghc_llvm_archs}
@@ -552,6 +560,9 @@ cd hadrian
 %global hadrian_llvm +llvm
 %endif
 %define hadrian_docs %{!?with_haddock:--docs=no-haddocks} --docs=%[%{?with_manual} ? "no-sphinx-pdfs" : "no-sphinx"]
+# aarch64 with 224 cpus: _build/stage0/bin/ghc: createProcess: pipe: resource exhausted (Too many open files)
+# https://koji.fedoraproject.org/koji/taskinfo?taskID=105428124
+%global _smp_ncpus_max 64
 # quickest does not build shared libs
 # try release instead of perf
 %{hadrian} %{?_smp_mflags} --flavour=%[%{?with_perfbuild} ? "perf" : "quick"]%{!?with_ghc_prof:+no_profiled_libs}%{?hadrian_llvm} %{hadrian_docs} binary-dist-dir
diff --git a/sphinx7.patch b/sphinx7.patch
new file mode 100644
index 0000000..0eb1dbd
--- /dev/null
+++ b/sphinx7.patch
@@ -0,0 +1,26 @@
+From 52d701b31dc4427b7e321a04be3f5f13a5fc271e Mon Sep 17 00:00:00 2001
+From: "mimi.vx" 
+Date: Wed, 24 May 2023 12:42:15 +0000
+Subject: [PATCH] Fix for Sphinx 7 removed style key
+
+Fixes https://gitlab.haskell.org/ghc/ghc/-/issues/23444
+---
+ docs/users_guide/rtd-theme/layout.html | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/users_guide/rtd-theme/layout.html b/docs/users_guide/rtd-theme/layout.html
+index 2a61142514a..7ffeff7befc 100644
+--- a/docs/users_guide/rtd-theme/layout.html
++++ b/docs/users_guide/rtd-theme/layout.html
+@@ -64,7 +64,7 @@
+   {%- endif %}
+ 
+   {# CSS #}
+-  <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
++  <link rel="stylesheet" href="{{ pathto('_static/' + styles[-1], 1) }}" type="text/css" />
+   <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+   {%- for css in css_files %}
+     {%- if css|attr("rel") %}
+-- 
+GitLab
+

commit 029e0a36829e907145b4c1929048d3a347be4687
Author: Jens Petersen 
Date:   Mon Sep 11 13:28:30 2023 +0800

user_guide: update external links patch to final upstream

https://gitlab.haskell.org/ghc/ghc/-/issues/22690

diff --git a/00dc51060881df81258ba3b3bdf447294618a4de.patch b/00dc51060881df81258ba3b3bdf447294618a4de.patch
index 91a37b3..822f75e 100644
--- a/00dc51060881df81258ba3b3bdf447294618a4de.patch
+++ b/00dc51060881df81258ba3b3bdf447294618a4de.patch
@@ -34,8 +34,8 @@ index dcc7fbaef62..c9888a13adc 100644
  extlinks = {
 -    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
 -    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
-+    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '%s'),
-+    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
++    'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#%s'),
++    'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '%s'),
  }

libs_base_uri = '../libraries'