rpms
/
ghc
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add RISCV64 to Cabal 

This is already merged upstreamed. See:
https://github.com/haskell/cabal/pull/9062

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-11-20 19:27:40 +02:00
parent 2f5be1a71c
commit 1f4e4e2818
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cabal-add-riscv64.patch Normal file
View File

@ -0,0 +1,43 @@
diff --git a/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs b/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs
index 68bda63..6521464 100644
--- a/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs
+++ b/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs
@@ -159,7 +159,7 @@ buildOS = classifyOS Permissive System.Info.os
-- | These are the known Arches: I386, X86_64, PPC, PPC64, Sparc,
-- Arm, AArch64, Mips, SH, IA64, S390, S390X, Alpha, Hppa, Rs6000,
--- M68k, Vax, JavaScript and Wasm32.
+-- M68k, Vax, RISCV64, JavaScript and Wasm32.
--
-- The following aliases can also be used:
-- * PPC alias: powerpc
@@ -173,7 +173,7 @@ data Arch = I386 | X86_64 | PPC | PPC64 | Sparc
| Arm | AArch64 | Mips | SH
| IA64 | S390 | S390X
| Alpha | Hppa | Rs6000
- | M68k | Vax
+ | M68k | Vax | RISCV64
| JavaScript
| Wasm32
| OtherArch String
@@ -188,7 +188,7 @@ knownArches = [I386, X86_64, PPC, PPC64, Sparc
,Arm, AArch64, Mips, SH
,IA64, S390, S390X
,Alpha, Hppa, Rs6000
- ,M68k, Vax
+ ,M68k, Vax, RISCV64
,JavaScript
,Wasm32]
diff --git a/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs
index fbe5710..a53b33d 100644
--- a/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs
+++ b/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs
@@ -729,6 +729,7 @@ platformDefines lbi =
Rs6000 -> ["rs6000"]
M68k -> ["m68k"]
Vax -> ["vax"]
+ RISCV64 -> ["riscv64"]
JavaScript -> ["javascript"]
Wasm32 -> ["wasm32"]
OtherArch _ -> []

9
ghc.spec
View File

@ -91,7 +91,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.1.riscv64%{?dist}
Release: 136.2.riscv64%{?dist}
Summary: Glasgow Haskell Compiler
License: BSD-3-Clause AND HaskellReport
@ -144,6 +144,10 @@ Patch27: haddock-remove-googleapis-fonts.patch
Patch30: https://src.opensuse.org/rpm/ghc/raw/branch/factory/sphinx7.patch
# RISCV64 added to Cabal
# See: https://github.com/haskell/cabal/pull/9062
Patch40: cabal-add-riscv64.patch
# https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
# fedora ghc has been bootstrapped on
@ -1011,6 +1015,9 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog
* Mon Nov 20 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.4.5-136.2.riscv64
- Add RISCV64 to Cabal
* Tue Nov 14 2023 David Abdurachmanov <davidlt@rivosinc.com> - 9.4.5-136.0.riscv64
- Add support for riscv64