Try again to enable LLVM, disable LTO

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

ghc.spec

@@ -11,6 +11,10 @@
 # build hadrian for production builds:
 %bcond build_hadrian 1
 
+%ifarch riscv64
+%global _lto_cflags %{nil}
+%endif
+
 # disabled to allow parallel install of ghc9.2-9.2.7 and ghc-9.2.6
 %if 0
 %global ghc_major 9.2
@@ -36,7 +40,7 @@
 %bcond ghc_prof 1
 # https://gitlab.haskell.org/ghc/ghc/-/issues/19754
 # https://github.com/haskell/haddock/issues/1384
-%ifnarch armv7hl %{ix86}
+%ifnarch armv7hl %{ix86} riscv64
 %bcond haddock 1
 %endif
 %if %{with hadrian}
@@ -73,11 +77,11 @@
 # 9.2 needs llvm 9-12
 %global llvm_major 12
 %if %{with hadrian}
-%global ghc_llvm_archs armv7hl s390x
-%global ghc_unregisterized_arches s390 %{mips} riscv64
+%global ghc_llvm_archs armv7hl s390x riscv64
+%global ghc_unregisterized_arches s390 %{mips}
 %else
-%global ghc_llvm_archs armv7hl
-%global ghc_unregisterized_arches s390 s390x %{mips} riscv64
+%global ghc_llvm_archs armv7hl riscv64
+%global ghc_unregisterized_arches s390 s390x %{mips}
 %endif
 
 %global obsoletes_ghcXY() \
@@ -93,7 +97,7 @@ Version: 9.2.6
 # - 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: 130.0.riscv64%{?dist}
+Release: 130.1.riscv64%{?dist}
 Summary: Glasgow Haskell Compiler
 
 License: BSD and HaskellReport
@@ -451,7 +455,7 @@ rm libffi-tarballs/libffi-*.tar.gz
 %endif
 
 # remove s390x after complete switching to llvm
-%ifarch %{ghc_unregisterized_arches} s390x
+%ifarch %{ghc_unregisterized_arches} s390x riscv64
 %patch15 -p1 -b .orig
 %patch16 -p1 -b .orig
 %endif
@@ -1005,6 +1009,11 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
 
 
 %changelog
+* Thu Apr 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-130.1.riscv64
+- Disable haddock on riscv64
+- Move riscv64 to LLVM arch
+- Disable LTO on riscv64 to speed up builds
+
 * Thu Apr 06 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-130.0.riscv64
 - Disable ld.gold on riscv64 (not supported)