diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-22 22:13:39 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-23 23:46:12 +0100 |
| commit | 5e1b3e924ab3d8da3718c2a3bbd0ef812595684a (patch) | |
| tree | 1af73a649f62f6db48b546958979840b24e13b19 /solenv | |
| parent | 2a0ff854b165883d33bbbbf1292c34858e9865d1 (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 (limited to 'solenv')
| -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.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 2 |
3 files changed, 4 insertions, 4 deletions
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) \ |