diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-08-06 16:23:03 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-24 10:04:40 +0100 |
| commit | d5b9998f22c71901183b20a5161559fa49508a68 (patch) | |
| tree | 7cb0f3b75fb2698db34a97c978e0dccaea69fb4f /bridges | |
| parent | ef95cad920e387c9639ad761c24a1a8222e6ac00 (diff) | |
Update config.{guess,sub} with latest versions and handle fallout of that
From http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD .
This time, do not apply the add-on change from
25a09c8776cc6088a5b2bf13dc84eb386c26bb7e to config.sub, but keep it
pristine. Instead, let's start using the name "aarch64" instead of
"arm64" for macOS and iOS in the autofoo context, as that is what
those tools call it. Clang and Apple call it arm64, though.
Change-Id: I1e05866c5fb08e0800cdfeaf7f6a71bfb43d1777
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100272
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106463
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 3cdce5bbe7a8..305d47bd6291 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -21,11 +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 := gcc3_ios -bridge_noopt_objects := cpp2uno except uno2cpp -bridge_asm_objects := ios64_helper - else ifeq ($(CPUNAME),AARCH64) ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),) @@ -37,6 +32,14 @@ $(eval $(call gb_Library_add_exception_objects,$(gb_CPPU_ENV)_uno, \ bridges/source/cpp_uno/$(bridges_SELECTED_BRIDGE)/callvirtualfunction, \ $(if $(HAVE_GCC_STACK_CLASH_PROTECTION),-fno-stack-clash-protection) \ )) +else ifneq ($(filter iOS MACOSX,$(OS)),) +# For now, use the same bridge for macOS on arm64 as for iOS. But we +# will eventually obviously want one that does generate code +# dynamically on macOS. +bridges_SELECTED_BRIDGE := gcc3_ios +bridge_noopt_objects := cpp2uno except uno2cpp +bridge_asm_objects := ios64_helper + endif else ifeq ($(CPUNAME),AXP) |