Rename LO Windows arm64 ID to aarch64

The Windows platform is called Arm64. But now that the ID for Mac
is also going to be renamed from arm64 to aarch64, this get's rid
of the arm64 as the UNO identifier and user in gbuild, just like
on all other Arm64 platforms.

Change-Id: I60a7eafd04b426f17b6e41ad9a09e6405c0d4173
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112973
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

7 files changed, 9 insertions, 9 deletions

diff --git a/external/libffi/ExternalProject_libffi.mk b/external/libffi/ExternalProject_libffi.mk
index c9c89828768c..b9e4254d9b2c 100644
--- a/external/libffi/ExternalProject_libffi.mk
+++ b/external/libffi/ExternalProject_libffi.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,libffi,\
 libffi_WIN_PLATFORM := $(strip \
     $(if $(filter INTEL,$(CPUNAME)),32) \
     $(if $(filter X86_64,$(CPUNAME)),64) \
-    $(if $(filter ARM64,$(CPUNAME)),arm64) \
+    $(if $(filter AARCH64,$(CPUNAME)),arm64) \
     )
 
 $(call gb_ExternalProject_get_state_target,libffi,build):
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk
index bc23354fa113..6f07750c55eb 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
 	UnpackedTarball/libpng/pngwrite \
 	UnpackedTarball/libpng/pngwtran \
 	UnpackedTarball/libpng/pngwutil \
-	$(if $(filter ARM AARCH64 ARM64,$(CPUNAME)),\
+	$(if $(filter ARM AARCH64,$(CPUNAME)),\
 	    UnpackedTarball/libpng/arm/arm_init \
 	    UnpackedTarball/libpng/arm/filter_neon_intrinsics \
 	    UnpackedTarball/libpng/arm/palette_neon_intrinsics \
@@ -49,7 +49,7 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\
 ))
 
 $(eval $(call gb_StaticLibrary_add_defs,libpng,\
-	$(if $(filter ARM AARCH64 ARM64,$(CPUNAME)), -DPNG_ARM_NEON) \
+	$(if $(filter ARM AARCH64,$(CPUNAME)), -DPNG_ARM_NEON) \
 	$(if $(filter POWERPC POWERPC64,$(CPUNAME)), -DPNG_POWERPC_VSX ) \
 	$(if $(filter INTEL X86_64,$(CPUNAME)), -DPNG_INTEL_SSE_OPT) \
 ))
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index fb68da65adff..81e5dfb45d3e 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -28,12 +28,12 @@ $(call gb_ExternalProject_get_state_target,nss,build): \
 			OPT_CODE_SIZE=0) \
 		OS_TARGET=WIN95 \
 		$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
-		$(if $(filter ARM64,$(CPUNAME)),USE_64=1) \
+		$(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \
 		LIB="$(ILIB)" \
 		XCFLAGS="$(SOLARINC)" \
 		$(if $(CROSS_COMPILING),\
 			CROSS_COMPILE=1 \
-			$(if $(filter ARM64,$(CPUNAME)),CPU_ARCH=aarch64) \
+			$(if $(filter AARCH64,$(CPUNAME)),CPU_ARCH=aarch64) \
 			NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \
 		$(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
 			NSINSTALL='$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index d0790e5e5b7b..a6082932b8f8 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -44,7 +44,7 @@ OPENSSL_PLATFORM := \
         $(if $(filter WNT,$(OS)),\
           $(if $(filter INTEL,$(CPUNAME)),VC-WIN32)\
           $(if $(filter X86_64,$(CPUNAME)),VC-WIN64A)\
-          $(if $(filter ARM64,$(CPUNAME)),VC-WIN64-ARM)\
+          $(if $(filter AARCH64,$(CPUNAME)),VC-WIN64-ARM)\
         ,\
           $(if $(filter MACOSX,$(OS)),\
             $(if $(filter X86_64,$(CPUNAME)),darwin64-x86_64-cc)\
diff --git a/external/postgresql/UnpackedTarball_postgresql.mk b/external/postgresql/UnpackedTarball_postgresql.mk
index b941de56822e..11fb603ef34f 100644
--- a/external/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
 	external/postgresql/windows.patch.0 \
 	external/postgresql/postgresql.exit.patch.0 \
 	external/postgresql/postgres-msvc-build.patch.1 \
-	$(if $(filter WNT_ARM64,$(OS)_$(CPUNAME)), external/postgresql/arm64.patch.1) \
+	$(if $(filter WNT_AARCH64,$(OS)_$(CPUNAME)), external/postgresql/arm64.patch.1) \
 ))
 
 ifeq ($(CROSS_COMPILING),)
diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index 8448d24db3b0..a06d919e01ce 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
 ifeq ($(OS),WNT)
 ifeq ($(CPUNAME),X86_64)
 python_arch_subdir=amd64/
-else ifeq ($(CPUNAME),ARM64)
+else ifeq ($(CPUNAME),AARCH64)
 python_arch_subdir=arm64/
 else
 python_arch_subdir=win32/
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk
index ab12388cadfe..7ab2877d55ae 100644
--- a/external/skia/Library_skia.mk
+++ b/external/skia/Library_skia.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Library_set_warnings_disabled,skia))
 
 $(eval $(call gb_Library_use_unpacked,skia,skia))
 
-ifneq ($(OS)_$(CPUNAME),WNT_ARM64)
+ifneq ($(OS)_$(CPUNAME),WNT_AARCH64)
 $(eval $(call gb_Library_use_clang,skia))
 $(eval $(call gb_Library_set_clang_precompiled_header,skia,external/skia/inc/pch/precompiled_skia))
 else