From fa3f6b6985ce68a1333c53daaa1d8ca5c05f9231 Mon Sep 17 00:00:00 2001
From: Mike Pilgrem <mpilgrem@users.noreply.github.com>
Date: Sun, 17 Dec 2023 22:10:19 +0000
Subject: [PATCH] Fix #9534 Add constructor `PPC64LE` to type `Arch`, for
powerpc64le
Also makes consequent changes.
---
Cabal-syntax/src/Distribution/System.hs | 10 +++++++---
Cabal/src/Distribution/Simple/GHC/Internal.hs | 1 +
Cabal/src/Distribution/Simple/PreProcess.hs | 1 +
changelog.d/issue-9534 | 11 +++++++++++
4 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 changelog.d/issue-9534
diff --git a/Cabal-syntax/src/Distribution/System.hs b/Cabal-syntax/src/Distribution/System.hs
index b15d8e388e..e1e75aa231 100644
--- a/Cabal-syntax/src/Distribution/System.hs
+++ b/Cabal-syntax/src/Distribution/System.hs
@@ -181,13 +181,14 @@ buildOS = classifyOS Permissive System.Info.os
-- ------------------------------------------------------------
--- | These are the known Arches: I386, X86_64, PPC, PPC64, Sparc,
+-- | These are the known Arches: I386, X86_64, PPC, PPC64, PPC64LE, Sparc,
-- Sparc64, Arm, AArch64, Mips, SH, IA64, S390, S390X, Alpha, Hppa,
-- Rs6000, M68k, Vax, RISCV64, LoongArch64, JavaScript and Wasm32.
--
-- The following aliases can also be used:
-- * PPC alias: powerpc
--- * PPC64 alias : powerpc64, powerpc64le
+-- * PPC64 alias : powerpc64
+-- * PPC64LE alias : powerpc64le
-- * Mips aliases: mipsel, mipseb
-- * Arm aliases: armeb, armel
-- * AArch64 aliases: arm64
@@ -196,6 +197,7 @@ data Arch
| X86_64
| PPC
| PPC64
+ | PPC64LE
| Sparc
| Sparc64
| Arm
@@ -227,6 +229,7 @@ knownArches =
, X86_64
, PPC
, PPC64
+ , PPC64LE
, Sparc
, Sparc64
, Arm
@@ -251,7 +254,8 @@ archAliases :: ClassificationStrictness -> Arch -> [String]
archAliases Strict _ = []
archAliases Compat _ = []
archAliases _ PPC = ["powerpc"]
-archAliases _ PPC64 = ["powerpc64", "powerpc64le"]
+archAliases _ PPC64 = ["powerpc64"]
+archAliases _ PPC64LE = ["powerpc64le"]
archAliases _ Mips = ["mipsel", "mipseb"]
archAliases _ Arm = ["armeb", "armel"]
archAliases _ AArch64 = ["arm64"]
diff --git a/Cabal/src/Distribution/Simple/GHC/Internal.hs b/Cabal/src/Distribution/Simple/GHC/Internal.hs
index 3ab3c85be3..0574a868ba 100644
--- a/Cabal/src/Distribution/Simple/GHC/Internal.hs
+++ b/Cabal/src/Distribution/Simple/GHC/Internal.hs
@@ -774,6 +774,7 @@ profDetailLevelFlag forLib mpl =
ghcArchString :: Arch -> String
ghcArchString PPC = "powerpc"
ghcArchString PPC64 = "powerpc64"
+ghcArchString PPC64LE = "powerpc64le"
ghcArchString other = prettyShow other
-- | GHC's rendering of its host or target 'OS' as used in its platform
diff --git a/Cabal/src/Distribution/Simple/PreProcess.hs b/Cabal/src/Distribution/Simple/PreProcess.hs
index 91c8074ca3..4f69ce6fc0 100644
--- a/Cabal/src/Distribution/Simple/PreProcess.hs
+++ b/Cabal/src/Distribution/Simple/PreProcess.hs
@@ -788,6 +788,7 @@ platformDefines lbi =
X86_64 -> ["x86_64"]
PPC -> ["powerpc"]
PPC64 -> ["powerpc64"]
+ PPC64LE -> ["powerpc64le"]
Sparc -> ["sparc"]
Sparc64 -> ["sparc64"]
Arm -> ["arm"]
diff --git a/changelog.d/issue-9534 b/changelog.d/issue-9534
new file mode 100644
index 0000000000..61d6d70e6e
--- /dev/null
+++ b/changelog.d/issue-9534
@@ -0,0 +1,11 @@
+synopsis: Distinguish `powerpc64le`, by adding `PPC64LE` constructor to type `Arch`
+packages: Cabal Cabal-syntax
+issues: #9534
+
+description: {
+
+Adds constructor `PPC64LE` to type `Arch` to distinguish architecture
+powerpc64le from powerpc64. Existing constructor `PPC64` now exclusively
+represents powerpc64.
+
+}
--
GitLab