From 90d1167e2fcf13291d98764a53ef67c4c3e9cc85 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Sat, 21 Dec 2024 17:25:12 +0200
Subject: [PATCH] Remove another upstreamed patch

This is merged upstream already.

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
---
 ...aca95ac25adc9888083669b32ff551151259.patch | 26 -------------------
 ghc9.10.spec                                  |  9 -------
 2 files changed, 35 deletions(-)
 delete mode 100644 dd38aca95ac25adc9888083669b32ff551151259.patch

diff --git a/dd38aca95ac25adc9888083669b32ff551151259.patch b/dd38aca95ac25adc9888083669b32ff551151259.patch
deleted file mode 100644
index 77a7100..0000000
--- a/dd38aca95ac25adc9888083669b32ff551151259.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From dd38aca95ac25adc9888083669b32ff551151259 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Mon, 19 Jun 2023 10:38:26 +0200
-Subject: [PATCH] Hadrian: enable GHCi support on riscv64
-
----
- hadrian/src/Oracles/Setting.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs
-index b9e5d312074..93561a94fe4 100644
---- a/hadrian/src/Oracles/Setting.hs
-+++ b/hadrian/src/Oracles/Setting.hs
-@@ -302,7 +302,8 @@ ghcWithInterpreter = do
-                           , "darwin", "kfreebsdgnu" ]
-     goodArch <- anyTargetArch [ "i386", "x86_64", "powerpc"
-                               , "arm", "aarch64", "s390x"
--                              , "powerpc64", "powerpc64le" ]
-+                              , "powerpc64", "powerpc64le"
-+                              , "riscv64" ]
-     return $ goodOs && goodArch
- 
- -- | Variants of the ARM architecture.
--- 
-GitLab
-
diff --git a/ghc9.10.spec b/ghc9.10.spec
index 3ca2453..1ce23b0 100644
--- a/ghc9.10.spec
+++ b/ghc9.10.spec
@@ -99,10 +99,6 @@ Patch27: haddock-remove-googleapis-fonts.patch
 # https://gitlab.haskell.org/ghc/ghc/-/issues/23034
 Patch35: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12885.patch
 
-# Enable GHCi support on riscv64
-# Upstream in >= 9.9.
-Patch41: https://gitlab.haskell.org/ghc/ghc/-/commit/dd38aca95ac25adc9888083669b32ff551151259.patch
-
 # libraries
 Patch100: https://github.com/haskell/os-string/commit/bafe87d871399b58ce4a50592b980c990a3eac39.patch
 
@@ -426,11 +422,6 @@ rm libffi-tarballs/libffi-*.tar.gz
 %patch -P 35 -p1 -b .orig
 %endif
 
-%ifarch riscv64
-#GHCi support
-%patch -P41 -p1 -b .orig
-%endif
-
 (
 cd libraries/os-string
 %patch -P100 -p1 -b .orig