iOS, remove support for 32bit (arm).

Supporting 32bit iOS, means a.o. adding several libraries to
the dependency list because macOSX does not install them by
default (e.g. zlib).

32bit is only used in old iPhones.

updated configure.ac
removed from solenv/gbuild/platform
bridges corrected

Change-Id: I415e744a9cb4acb3b5fbfca33c22940a1d56e390

bridges/CustomTarget_gcc3_ios_arm.mk → bridges/CustomTarget_gcc3_ios.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_ios_arm))
+$(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_ios))
 
-$(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_ios_arm) : \
-	$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S
+$(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_ios) : \
+	$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S
 
-$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S : \
-	$(SRCDIR)/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl \
-	| $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/.dir
+$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/codesnippets.S : \
+	$(SRCDIR)/bridges/source/cpp_uno/gcc3_ios/generate-snippets.pl \
+	| $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios)/.dir
 	$(PERL) $< > $@
 
 # vim: set noet sw=4 ts=4:

bridges/Library_cpp_uno.mk

@@ -10,18 +10,8 @@
 $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
 
 ifeq ($(OS),IOS)
-bridges_SELECTED_BRIDGE := gcc3_ios_arm
-bridge_noopt_objects := cpp2uno except uno2cpp
-# HACK
-#$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \
-#	$(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
-#$(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
-
-#$(eval $(call gb_Library_use_sdk_api,gcc3_uno))
-#bridge_asm_objects := helper
-#bridge_exception_objects := cpp2uno cpp2uno-arm cpp2uno-arm64 cpp2uno-i386 except uno2cpp uno2cpp-arm uno2cpp-arm64 uno2cpp-i386
-#$(eval $(call gb_Library_use_custom_headers,gcc3_uno,bridges/source/cpp_uno/gcc3_ios_arm))
+bridges_SELECTED_BRIDGE := gcc3_ios
+bridge_noopt_objects := cpp2uno cpp2uno-arm64 cpp2uno-i386 except uno2cpp uno2cpp-arm64 uno2cpp-i386
 
 else ifeq ($(CPUNAME),ARM)
 

bridges/Module_bridges.mk

@@ -18,7 +18,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
 	) \
 	$(if $(filter ARM,$(CPUNAME)),\
 		$(if $(filter IOS,$(OS)),\
-			CustomTarget_gcc3_ios_arm) \
+			CustomTarget_gcc3_ios) \
 		$(if $(filter ANDROID LINUX,$(OS)),\
 			CustomTarget_gcc3_linux_arm) \
 	) \

bridges/source/cpp_uno/gcc3_ios_arm/share.hxx → bridges/source/cpp_uno/gcc3_ios/share.hxx

@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_IOS_ARM_SHARE_HXX
-#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_IOS_ARM_SHARE_HXX
+#ifndef INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_IOS_SHARE_HXX
+#define INCLUDED_BRIDGES_SOURCE_CPP_UNO_GCC3_IOS_SHARE_HXX
 
 #include "uno/mapping.h"
 

configure.ac

@@ -620,7 +620,7 @@ darwin*) # Mac OS X or iOS
     test_freetype=no
     test_fontconfig=no
     test_dbus=no
-    if test "$host_cpu" = "arm" -o "$host_cpu" = "arm64"; then
+    if test "$host_cpu" = "arm64"; then
         _os=iOS
         test_gtk=no
         test_cups=no
@@ -2391,8 +2391,9 @@ if test -z "$enable_database_connectivity"; then
     # --disable-database-connectivity is unfinished work in progress
     # and the iOS test app doesn't link if we actually try to use it.
     # if test $_os != iOS -a $_os != Android; then
+    if test $_os != iOS; then
         enable_database_connectivity=yes
-    # fi
+    fi
 fi
 
 if test "$enable_database_connectivity" = yes; then
@@ -3066,7 +3067,7 @@ if test "$_os" = "WINNT"; then
     fi
 fi
 if test "$_os" = "iOS"; then
-    if test "$host_cpu" = "arm" -o "$host_cpu" = "arm64" ; then
+    if test "$host_cpu" = "arm64" ; then
         cross_compiling="yes"
     fi
 fi
@@ -3936,16 +3937,7 @@ darwin*)
 
     case "$host_cpu" in
     arm)
-        OS=IOS
-        if test "$enable_ios_simulator" = "yes"; then
-            CPUNAME=I386
-            RTL_ARCH=x86
-            PLATFORMID=macosx_x86
-        else
-            RTL_ARCH=ARM_EABI
-            CPUNAME=ARM
-            PLATFORMID=ios_arm
-        fi
+        AC_MSG_ERROR([Can't build 32-bit code for iOS])
         ;;
     arm64)
         OS=IOS
@@ -5577,14 +5569,7 @@ dnl ===================================================================
 if test "$_os" != "WINNT"; then
 
 if test "$_os" == "iOS"; then
-if test "$host_cpu" == "arm"; then
-  ac_cv_sizeof_long=4
-  ac_cv_sizeof_short=2
-  ac_cv_sizeof_int=4
-  ac_cv_sizeof_long_long=8
-  ac_cv_sizeof_double=8
-  ac_cv_sizeof_voidp=4
-else
+if test "$host_cpu" == "arm64"; then
   ac_cv_sizeof_long=8
   ac_cv_sizeof_short=2
   ac_cv_sizeof_int=4

solenv/gbuild/platform/iOS_ARM_GCC.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-gb_CPUDEFS := -DARM32
-
-include $(GBUILDDIR)/platform/iOS.mk

solenv/gbuild/platform/iOS_I386_GCC.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-#   Licensed to the Apache Software Foundation (ASF) under one or more
-#   contributor license agreements. See the NOTICE file distributed
-#   with this work for additional information regarding copyright
-#   ownership. The ASF licenses this file to you under the Apache
-#   License, Version 2.0 (the "License"); you may not use this file
-#   except in compliance with the License. You may obtain a copy of
-#   the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-gb_CPUDEFS := -DI386
-
-include $(GBUILDDIR)/platform/iOS.mk