Try to use LLVM for riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-03-07 20:00:34 +02:00
parent 4cfd88badd
commit 9569b7fa8a
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
1 changed files with 9 additions and 6 deletions

View File

@ -70,11 +70,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() \
@ -88,7 +88,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: 129.0.riscv64%{?dist}
Release: 129.1.riscv64%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD and HaskellReport
@ -446,7 +446,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
@ -1000,6 +1000,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog
* Tue Mar 07 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-129.1.riscv64
- Switch riscv64 to LLVM
* Thu Mar 02 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.2.6-129.0.riscv64
- Disable ld.gold on riscv64 (not supported)