From 3bb8ec7cc5c1dba74216ea42b94bf2284bf286d0 Mon Sep 17 00:00:00 2001
From: brainbreaker <gautamprajapati06@gmail.com>
Date: Wed, 21 Jun 2017 17:30:40 +0530
Subject: android: Fix bridges/ module for building with Clang

Change-Id: If8bcda3aa8c3a3e46cd98e5ae797486f32db9822
Reviewed-on: https://gerrit.libreoffice.org/39050
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
---
 bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 2 +-
 bridges/source/cpp_uno/gcc3_linux_arm/share.hxx   | 2 +-
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 3 ++-
 configure.ac                                      | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
index 61a24879da09..b695cabcf4df 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
@@ -402,7 +402,7 @@ namespace
                     }
                     TYPELIB_DANGER_RELEASE( pTD );
                 }
-            } // else perform queryInterface()
+            } SAL_FALLTHROUGH; // else perform queryInterface()
             default:
                 eRet = cpp2uno_call(
                     pCppI, aMemberDescr.get(),
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 459db19ef4b3..492f1b699b9f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -23,7 +23,7 @@
 #include <typeinfo>
 #include <exception>
 #include <cstddef>
-#include <unwind.h>
+#include <unwind-arm.h>
 
 #include <cxxabi.h>
 #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index ee8c17fc62a5..c8e079efbc12 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -168,6 +168,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
         case typelib_TypeClass_HYPER:
         case typelib_TypeClass_UNSIGNED_HYPER:
             pRegisterReturn[1] = r1;
+            SAL_FALLTHROUGH;
         case typelib_TypeClass_LONG:
         case typelib_TypeClass_UNSIGNED_LONG:
         case typelib_TypeClass_ENUM:
@@ -702,7 +703,7 @@ void unoInterfaceProxyDispatch(
                 }
                 TYPELIB_DANGER_RELEASE( pTD );
             }
-        } // else perform queryInterface()
+        } SAL_FALLTHROUGH; // else perform queryInterface()
         default:
             // dependent dispatch
             cpp_call(
diff --git a/configure.ac b/configure.ac
index 60c4a91bb8b2..36f6ccebf452 100644
--- a/configure.ac
+++ b/configure.ac
@@ -417,7 +417,6 @@ if test -n "$with_android_ndk"; then
         ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
         ;;
     clang3.3|clang3.4)
-        AC_MSG_WARN([Building with the Clang tool-chain is known to break in the bridges module, fix that please])
         ANDROID_BINUTILS_DIR=$ANDROID_NDK_HOME/toolchains/$android_platform_prefix-4.8
         ANDROID_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
         ANDROID_USING_CLANG=true
@@ -559,7 +558,7 @@ if test -n "$with_android_ndk"; then
     fi
 
     if test $host_cpu = arm; then
-        ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/armeabi-v7a/include"
+        ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}include -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/armeabi-v7a/include -I $ANDROID_NDK_HOME/sources/cxx-stl/gabi++/include"
     elif test $host_cpu = mips; then
         ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/${ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR}libs/mips/include"
     else # x86
-- 
cgit