mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Fix bridges/ module for building with Clang

Browse Source 
Change-Id: If8bcda3aa8c3a3e46cd98e5ae797486f32db9822
Reviewed-on: https://gerrit.libreoffice.org/39050
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
brainbreaker
2017-06-21 17:30:40 +05:30
committed by Miklos Vajna
parent e9ad1b4f2f
commit 3bb8ec7cc5
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
View File

@@ -402,7 +402,7 @@ namespace
} }
TYPELIB_DANGER_RELEASE( pTD ); TYPELIB_DANGER_RELEASE( pTD );
} }
} // else perform queryInterface() } SAL_FALLTHROUGH; // else perform queryInterface()
default: default:
eRet = cpp2uno_call( eRet = cpp2uno_call(
pCppI, aMemberDescr.get(), pCppI, aMemberDescr.get(),

2
bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
View File

@@ -23,7 +23,7 @@
#include <typeinfo> #include <typeinfo>
#include <exception> #include <exception>
#include <cstddef> #include <cstddef>
#include <unwind.h> #include <unwind-arm.h>
#include <cxxabi.h> #include <cxxabi.h>
#ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h #ifndef _GLIBCXX_CDTOR_CALLABI // new in GCC 4.7 cxxabi.h

3
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
View File

@@ -168,6 +168,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference *
case typelib_TypeClass_HYPER: case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER: case typelib_TypeClass_UNSIGNED_HYPER:
pRegisterReturn[1] = r1; pRegisterReturn[1] = r1;
SAL_FALLTHROUGH;
case typelib_TypeClass_LONG: case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG: case typelib_TypeClass_UNSIGNED_LONG:
case typelib_TypeClass_ENUM: case typelib_TypeClass_ENUM:
@@ -702,7 +703,7 @@ void unoInterfaceProxyDispatch(
} }
TYPELIB_DANGER_RELEASE( pTD ); TYPELIB_DANGER_RELEASE( pTD );
} }
} // else perform queryInterface() } SAL_FALLTHROUGH; // else perform queryInterface()
default: default:
// dependent dispatch // dependent dispatch
cpp_call( cpp_call(

3
configure.ac
View File

@@ -417,7 +417,6 @@ if test -n "$with_android_ndk"; then
ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR ANDROID_COMPILER_DIR=$ANDROID_BINUTILS_DIR
;; ;;
clang3.3|clang3.4) 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_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_COMPILER_DIR=$ANDROID_NDK_HOME/toolchains/llvm-${with_android_ndk_toolchain_version#clang}
ANDROID_USING_CLANG=true ANDROID_USING_CLANG=true
@@ -559,7 +558,7 @@ if test -n "$with_android_ndk"; then
fi fi
if test $host_cpu = arm; then 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 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" 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 else # x86