Skip to content

Commit 48c2d4c

Browse files
committed
Capitalise “AArch” properly
The official capitalisation is “AArch”, see https://developer.arm.com/documentation/102374/latest/.
1 parent 269c1b1 commit 48c2d4c

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

Cabal/src/Distribution/Simple/Build/PathsModule.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ generatePathsModule pkg_descr lbi clbi =
5151
, Z.zIsWindows = isWindows
5252
, Z.zIsI386 = buildArch == I386
5353
, Z.zIsX8664 = buildArch == X86_64
54-
, Z.zIsAarch64 = buildArch == AArch64
54+
, Z.zIsAArch64 = buildArch == AArch64
5555
, Z.zNot = not
5656
, Z.zManglePkgName = showPkgName
5757
, Z.zPrefix = show flat_prefix

Cabal/src/Distribution/Simple/Build/PathsModule/Z.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ data Z
1212
zIsWindows :: Bool,
1313
zIsI386 :: Bool,
1414
zIsX8664 :: Bool,
15-
zIsAarch64 :: Bool,
15+
zIsAArch64 :: Bool,
1616
zPrefix :: FilePath,
1717
zBindir :: FilePath,
1818
zLibdir :: FilePath,
@@ -350,13 +350,13 @@ render z_root = execWriter $ do
350350
tell " c_GetModuleFileName :: Ptr () -> CWString -> Int32 -> IO Int32\n"
351351
return ()
352352
else do
353-
if (zIsAarch64 z_root)
353+
if (zIsAArch64 z_root)
354354
then do
355355
tell "foreign import ccall unsafe \"windows.h GetModuleFileNameW\"\n"
356356
tell " c_GetModuleFileName :: Ptr () -> CWString -> Int32 -> IO Int32\n"
357357
return ()
358358
else do
359-
tell "-- win32 supported only with I386, X86_64, Aarch64\n"
359+
tell "-- win32 supported only with I386, X86_64, AArch64\n"
360360
tell "c_GetModuleFileName :: Ptr () -> CWString -> Int32 -> IO Int32\n"
361361
tell "c_GetModuleFileName = _\n"
362362
return ()

cabal-dev-scripts/src/GenPathsModule.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $(capture "decls" [d|
3232
, zIsWindows :: Bool
3333
, zIsI386 :: Bool
3434
, zIsX8664 :: Bool
35-
, zIsAarch64 :: Bool
35+
, zIsAArch64 :: Bool
3636

3737
, zPrefix :: FilePath
3838
, zBindir :: FilePath

changelog.d/pr-10705

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
synopsis: 'Add support for Windows Aarch64'
2+
synopsis: 'Add support for Windows AArch64'
33
packages: [Cabal, cabal-install]
44
prs: 10705
55
---
66

7-
Adds to preprocessor branches the option to support `aarch64_HOST_ARCH` platform on Windows Aarch64 target.
8-
`ccall` convention is used at Aarch64, same as for `x86_64_HOST_ARCH`. Introduce `zIsAarch64` to make paths generation support Windows Aarch64 target.
7+
Adds to preprocessor branches the option to support `aarch64_HOST_ARCH` platform on Windows AArch64 target.
8+
`ccall` convention is used at AArch64, same as for `x86_64_HOST_ARCH`. Introduce `zIsAArch64` to make paths generation support Windows AArch64 target.

templates/Paths_pkg.template.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@ foreign import stdcall unsafe "windows.h GetModuleFileNameW"
205205
{% elif isX8664 %}
206206
foreign import ccall unsafe "windows.h GetModuleFileNameW"
207207
c_GetModuleFileName :: Ptr () -> CWString -> Int32 -> IO Int32
208-
{% elif isAarch64 %}
208+
{% elif isAArch64 %}
209209
foreign import ccall unsafe "windows.h GetModuleFileNameW"
210210
c_GetModuleFileName :: Ptr () -> CWString -> Int32 -> IO Int32
211211
{% else %}
212-
-- win32 supported only with I386, X86_64, Aarch64
212+
-- win32 supported only with I386, X86_64, AArch64
213213
c_GetModuleFileName :: Ptr () -> CWString -> Int32 -> IO Int32
214214
c_GetModuleFileName = _
215215
{% endif %}

0 commit comments

Comments
 (0)