summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-03-22 22:13:39 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2021-03-23 23:46:12 +0100
commit5e1b3e924ab3d8da3718c2a3bbd0ef812595684a (patch)
tree1af73a649f62f6db48b546958979840b24e13b19
parent2a0ff854b165883d33bbbbf1292c34858e9865d1 (diff)
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>
Diffstat
-rw-r--r--Repository.mk10
-rw-r--r--RepositoryExternal.mk2
-rw-r--r--bridges/Library_cpp_uno.mk13
-rw-r--r--cli_ure/Module_cli_ure.mk2
-rw-r--r--configure.ac10
-rw-r--r--desktop/source/deployment/misc/dp_platform.cxx2
-rw-r--r--external/libffi/ExternalProject_libffi.mk2
-rw-r--r--external/libpng/StaticLibrary_libpng.mk4
-rw-r--r--external/nss/ExternalProject_nss.mk4
-rw-r--r--external/openssl/ExternalProject_openssl.mk2
-rw-r--r--external/postgresql/UnpackedTarball_postgresql.mk2
-rw-r--r--external/python3/ExternalPackage_python3.mk2
-rw-r--r--external/skia/Library_skia.mk2
-rw-r--r--odk/CustomTarget_check.mk2
-rw-r--r--odk/Module_odk.mk2
-rw-r--r--solenv/gbuild/platform/WNT_AARCH64_MSC.mk (renamed from solenv/gbuild/platform/WNT_ARM64_MSC.mk)0
-rw-r--r--solenv/gbuild/platform/com_MSC_class.mk6
-rw-r--r--solenv/gbuild/platform/windows.mk2
-rw-r--r--unoil/Module_unoil.mk2
19 files changed, 36 insertions, 35 deletions
diff --git a/Repository.mk b/Repository.mk
index d61b3037c1f0..ab7daa3ef333 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -76,7 +76,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
))
$(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
- $(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),climaker)) \
+ $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),climaker)) \
cppumaker \
idlc \
javamaker \
@@ -149,7 +149,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
unoinfo \
unopkg \
unopkg_com \
- $(if $(filter-out ARM64,$(CPUNAME)),twain32shim) \
+ $(if $(filter-out AARCH64,$(CPUNAME)),twain32shim) \
) \
))
@@ -541,7 +541,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
affine_uno_uno \
- $(if $(filter MSC,$(COM)),$(if $(filter-out ARM64,$(CPUNAME)),cli_uno)) \
+ $(if $(filter MSC,$(COM)),$(if $(filter-out AARCH64,$(CPUNAME)),cli_uno)) \
i18nlangtag \
$(if $(ENABLE_JAVA), \
java_uno \
@@ -554,7 +554,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
unsafe_uno_uno \
$(if $(filter MSC,$(COM)), \
$(if $(filter INTEL,$(CPUNAME)),msci, \
- $(if $(filter ARM64,$(CPUNAME)),msca,mscx)),gcc3)_uno \
+ $(if $(filter AARCH64,$(CPUNAME)),msca,mscx)),gcc3)_uno \
))
$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
@@ -833,7 +833,7 @@ $(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\
$(eval $(call gb_Helper_register_packages_for_install,sdk,\
odk_share_readme \
odk_share_readme_generated \
- $(if $(filter WNT,$(OS)),$(if $(filter-out ARM64,$(CPUNAME)),odk_cli)) \
+ $(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64,$(CPUNAME)),odk_cli)) \
odk_config \
$(if $(filter WNT,$(OS)),odk_config_win) \
odk_docs \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a40710e91ab6..46b42b5fea32 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3194,7 +3194,7 @@ endif
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/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index a29f6b56f620..4981a81bee42 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -21,13 +21,6 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \
EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
endif
-else ifeq ($(CPUNAME),ARM64)
-
-bridges_SELECTED_BRIDGE := msvc_win32_arm64
-bridge_exception_objects := cpp2uno uno2cpp abi
-bridge_noopt_objects := except
-bridge_asm_objects := callvirtualfunction vtableslotcall
-
else ifeq ($(CPUNAME),AARCH64)
ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX MACOSX NETBSD OPENBSD,$(OS)),)
@@ -46,6 +39,12 @@ bridges_SELECTED_BRIDGE := gcc3_ios
bridge_noopt_objects := cpp2uno except uno2cpp
bridge_asm_objects := ios64_helper
+else ifeq ($(COM),MSC)
+bridges_SELECTED_BRIDGE := msvc_win32_arm64
+bridge_exception_objects := cpp2uno uno2cpp abi
+bridge_noopt_objects := except
+bridge_asm_objects := callvirtualfunction vtableslotcall
+
endif
else ifeq ($(CPUNAME),AXP)
diff --git a/cli_ure/Module_cli_ure.mk b/cli_ure/Module_cli_ure.mk
index 91863abb59c9..3730ebdc75f0 100644
--- a/cli_ure/Module_cli_ure.mk
+++ b/cli_ure/Module_cli_ure.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Module_Module,cli_ure))
ifeq ($(COM),MSC)
-ifneq ($(CPUNAME),ARM64)
+ifneq ($(CPUNAME),AARCH64)
$(eval $(call gb_Module_add_targets,cli_ure,\
CliLibrary_cli_basetypes \
CliLibrary_cli_ure \
diff --git a/configure.ac b/configure.ac
index 368ccb84daa4..7cc376d9b242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3601,11 +3601,11 @@ cygwin*|wsl*)
WIN_OTHER_ARCH="x64"
;;
aarch64)
- CPUNAME=ARM64
- RTL_ARCH=arm64
- PLATFORMID=windows_arm64
+ CPUNAME=AARCH64
+ RTL_ARCH=AARCH64
+ PLATFORMID=windows_aarch64
WINDOWS_X64=1
- SCPDEFS="$SCPDEFS -DWINDOWS_ARM64"
+ SCPDEFS="$SCPDEFS -DWINDOWS_AARCH64"
WIN_HOST_ARCH="arm64"
WIN_HOST_BITS=64
with_ucrt_dir=no
@@ -11713,7 +11713,7 @@ LO_CLANG_CXXFLAGS_INTRINSICS_AVX512=
LO_CLANG_CXXFLAGS_INTRINSICS_F16C=
LO_CLANG_CXXFLAGS_INTRINSICS_FMA=
-if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT" -a "$CPUNAME" = "ARM64" \); then
+if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE -a ! \( "$_os" = "WINNT" -a "$CPUNAME" = "AARCH64" \); then
if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
AC_MSG_CHECKING([for Clang])
AC_MSG_RESULT([$LO_CLANG_CC / $LO_CLANG_CXX])
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index 078d6760ad17..964d75c7cd69 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -77,6 +77,8 @@ namespace
ret = checkOSandCPU(u"Windows", u"x86");
else if (token == u"windows_x86_64")
ret = checkOSandCPU(u"Windows", u"X86_64");
+ else if (token == u"windows_aarch64")
+ ret = checkOSandCPU(u"Windows", u"AARCH64");
else if (token == u"solaris_sparc")
ret = checkOSandCPU(u"Solaris", u"SPARC");
else if (token == u"solaris_sparc64")
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
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 74331955be9b..6477ad71e8c1 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -28,7 +28,7 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),windows,\
$(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
$(SRCDIR)/odk/util/check.pl \
$(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \
- $(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out ARM64,$(CPUNAME)),climaker)) cppumaker \
+ $(foreach exe,$(if $(filter WNT,$(OS)),$(if $(filter-out AARCH64,$(CPUNAME)),climaker)) cppumaker \
idlc javamaker $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader unoidl-check,\
$(call gb_Executable_get_target,$(exe))) \
$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 693885322115..16eba69c3e3a 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,odk,\
ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,odk,\
- $(if $(filter-out ARM64,$(CPUNAME)),Package_cli) \
+ $(if $(filter-out AARCH64,$(CPUNAME)),Package_cli) \
CustomTarget_config_win \
Package_config_win \
))
diff --git a/solenv/gbuild/platform/WNT_ARM64_MSC.mk b/solenv/gbuild/platform/WNT_AARCH64_MSC.mk
index 67e1d5736736..67e1d5736736 100644
--- a/solenv/gbuild/platform/WNT_ARM64_MSC.mk
+++ b/solenv/gbuild/platform/WNT_AARCH64_MSC.mk
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index f8a39cb4ab19..2f4e29c3ace1 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -134,7 +134,7 @@ fi
endef
# AsmObject class
-ifeq ($(CPUNAME),ARM64)
+ifeq ($(CPUNAME),AARCH64)
gb_AsmObject_get_source = $(1)/$(2).S
# Code needs a preprocessor step .S -> .asm -> .o
@@ -148,7 +148,7 @@ $(call gb_Helper_abbreviate_dirs,\
echo "$(1) : $(3)" > $(4)
endef
-else # !ARM64
+else # !AARCH64
gb_AsmObject_get_source = $(1)/$(2).asm
define gb_AsmObject__command
@@ -205,7 +205,7 @@ cat $${RESPONSEFILE} | sed 's/ /\n/g' | grep -v '^$$' > $${RESPONSEFILE}.1 && \
mv $${RESPONSEFILE}.1 $${RESPONSEFILE} &&
endef
-MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter ARM64,$(CPUNAME)),6.02,6.01)
+MSC_SUBSYSTEM_VERSION=$(COMMA)$(if $(filter AARCH64,$(CPUNAME)),6.02,6.01)
# the sort on the libraries is used to filter out duplicates to keep commandline
# length in check - otherwise the dupes easily hit the limit when linking mergedlib
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 14763e6dd4ea..f4bb632d35a2 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -47,7 +47,7 @@ gb_MSBUILD_CONFIG := $(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)
gb_MSBUILD_PLATFORM := $(strip \
$(if $(filter INTEL,$(CPUNAME)),Win32) \
$(if $(filter X86_64,$(CPUNAME)),x64) \
- $(if $(filter ARM64,$(CPUNAME)),ARM64) \
+ $(if $(filter AARCH64,$(CPUNAME)),ARM64) \
)
gb_MSBUILD_CONFIG_AND_PLATFORM := \
/p:Configuration=$(gb_MSBUILD_CONFIG) \
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index 6b1cb5fd064f..96c90e6b08c3 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Module_add_targets,unoil,\
endif
ifeq ($(COM),MSC)
-ifneq ($(CPUNAME),ARM64)
+ifneq ($(CPUNAME),AARCH64)
$(eval $(call gb_Module_add_targets,unoil,\
CliUnoApi_oootypes \
))
generated by cgit (git 2.34.1) at 2024-04-27 17:45:47 +0000