Skip to content

Commit d7872cb

Browse files
committed
Add support for 64-bit SPARC as a separate architecture
Previously, sparc64 was defined as an alias for the 32-bit SPARC architecture which was true while SPARC mainland was mostly 32 bits. More recently, 64-bit SPARC has become a port of its own, so it needs to be treated as a separate architecture.
1 parent 1908f51 commit d7872cb

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Cabal-syntax/src/Distribution/System.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,13 +182,12 @@ buildOS = classifyOS Permissive System.Info.os
182182
-- ------------------------------------------------------------
183183

184184
-- | These are the known Arches: I386, X86_64, PPC, PPC64, Sparc,
185-
-- Arm, AArch64, Mips, SH, IA64, S390, S390X, Alpha, Hppa, Rs6000,
186-
-- M68k, Vax, RISCV64, LoongArch64, JavaScript and Wasm32.
185+
-- Sparc64, Arm, AArch64, Mips, SH, IA64, S390, S390X, Alpha, Hppa,
186+
-- Rs6000, M68k, Vax, RISCV64, LoongArch64, JavaScript and Wasm32.
187187
--
188188
-- The following aliases can also be used:
189189
-- * PPC alias: powerpc
190190
-- * PPC64 alias : powerpc64, powerpc64le
191-
-- * Sparc aliases: sparc64, sun4
192191
-- * Mips aliases: mipsel, mipseb
193192
-- * Arm aliases: armeb, armel
194193
-- * AArch64 aliases: arm64
@@ -198,6 +197,7 @@ data Arch
198197
| PPC
199198
| PPC64
200199
| Sparc
200+
| Sparc64
201201
| Arm
202202
| AArch64
203203
| Mips
@@ -228,6 +228,7 @@ knownArches =
228228
, PPC
229229
, PPC64
230230
, Sparc
231+
, Sparc64
231232
, Arm
232233
, AArch64
233234
, Mips
@@ -251,7 +252,6 @@ archAliases Strict _ = []
251252
archAliases Compat _ = []
252253
archAliases _ PPC = ["powerpc"]
253254
archAliases _ PPC64 = ["powerpc64", "powerpc64le"]
254-
archAliases _ Sparc = ["sparc64", "sun4"]
255255
archAliases _ Mips = ["mipsel", "mipseb"]
256256
archAliases _ Arm = ["armeb", "armel"]
257257
archAliases _ AArch64 = ["arm64"]

Cabal/src/Distribution/Simple/PreProcess.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,7 @@ platformDefines lbi =
850850
PPC -> ["powerpc"]
851851
PPC64 -> ["powerpc64"]
852852
Sparc -> ["sparc"]
853+
Sparc64 -> ["sparc64"]
853854
Arm -> ["arm"]
854855
AArch64 -> ["aarch64"]
855856
Mips -> ["mips"]

0 commit comments

Comments
 (0)