From 903b363cb806f67dc8e2bee5b35614349d5b061d Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Mon, 17 Feb 2025 09:44:23 +0100 Subject: [PATCH] sparc64-cabal-support Debian-Bug: https://bugs.debian.org/1056033 Gbp-Pq: Name sparc64-cabal-support --- .../Cabal/Cabal-syntax/src/Distribution/System.hs | 11 ++++------- .../Cabal/Cabal/src/Distribution/Simple/PreProcess.hs | 1 + 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs b/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs index 68bda631..6aea5dc1 100644 --- a/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs +++ b/libraries/Cabal/Cabal-syntax/src/Distribution/System.hs @@ -158,19 +158,17 @@ 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. --- +-- Sparc64, Arm, AArch64, Mips, SH, IA64, S390, S390X, Alpha, Hppa, +-- Rs6000, M68k, Vax, JavaScript and Wasm32. -- The following aliases can also be used: -- * PPC alias: powerpc -- * PPC64 alias : powerpc64, powerpc64le --- * Sparc aliases: sparc64, sun4 -- * Mips aliases: mipsel, mipseb -- * Arm aliases: armeb, armel -- * AArch64 aliases: arm64 -- data Arch = I386 | X86_64 | PPC | PPC64 | Sparc - | Arm | AArch64 | Mips | SH + | Sparc64 | Arm | AArch64 | Mips | SH | IA64 | S390 | S390X | Alpha | Hppa | Rs6000 | M68k | Vax @@ -185,7 +183,7 @@ instance NFData Arch where rnf = genericRnf knownArches :: [Arch] knownArches = [I386, X86_64, PPC, PPC64, Sparc - ,Arm, AArch64, Mips, SH + ,Sparc64 ,Arm, AArch64, Mips, SH ,IA64, S390, S390X ,Alpha, Hppa, Rs6000 ,M68k, Vax @@ -197,7 +195,6 @@ archAliases Strict _ = [] archAliases Compat _ = [] archAliases _ PPC = ["powerpc"] archAliases _ PPC64 = ["powerpc64", "powerpc64le"] -archAliases _ Sparc = ["sparc64", "sun4"] archAliases _ Mips = ["mipsel", "mipseb"] archAliases _ Arm = ["armeb", "armel"] archAliases _ AArch64 = ["arm64"] diff --git a/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs b/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs index d47dd803..9c75bb95 100644 --- a/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs +++ b/libraries/Cabal/Cabal/src/Distribution/Simple/PreProcess.hs @@ -719,6 +719,7 @@ platformDefines lbi = PPC -> ["powerpc"] PPC64 -> ["powerpc64"] Sparc -> ["sparc"] + Sparc64 -> ["sparc64"] Arm -> ["arm"] AArch64 -> ["aarch64"] Mips -> ["mips"] -- 2.30.2