[Libreoffice-commits] core.git: bridges/source configure.ac

2019-12-18 Thread Stephan Bergmann (via logerrit) 
 bridges/source/cpp_uno/gcc3_linux_arm/share.hxx|2 +-
 bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx |2 +-
 configure.ac   |6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 97d736d27435fb26d5609000f77bd79ece08572e
Author: Stephan Bergmann 
AuthorDate: Wed Dec 18 10:59:46 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Dec 18 13:54:27 2019 +0100

Fix typos concerning the __cxa_exception check

...introduced with 069506bcb0ee4005b01c22095ed427b96b553c98 "Use 
config_cxxabi.h
to check for __cxa_eh_globals, __cxa_exception", but which appear to have 
been
harmless as (a) the checked-for __cxxabiv1::__cxa_exceptions never existed 
in
cxxabi.h, and (b) lack of __cxxabiv1::__cxa_exception in cxxabi.h happened 
to
conincide with !HAVE_CXXABI_H_CXA_EH_GLOBALS

Change-Id: I13f8a2b3cf0f03f2bc96cf053d2b571860055978
Reviewed-on: https://gerrit.libreoffice.org/85373
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx 
b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index ac380969e21b..0faa612d92fd 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -60,7 +60,7 @@ public:
 }
 #endif
 
-#if !HAVE_CXXABI_H_CXA_EH_GLOBALS
+#if !HAVE_CXXABI_H_CXA_EXCEPTION
 namespace __cxxabiv1 {
 struct __cxa_exception
 {
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx 
b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
index 864173470476..e8afe35c4f59 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
@@ -101,7 +101,7 @@ public:
 }
 #endif
 
-#if !HAVE_CXXABI_H_CXA_EH_GLOBALS
+#if !HAVE_CXXABI_H_CXA_EXCEPTION
 // ,
 // libcxxabi/src/cxa_exception.hpp:
 namespace __cxxabiv1 {
diff --git a/configure.ac b/configure.ac
index ba5e87ea1641..ad246a64f37a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6312,14 +6312,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
 ], [AC_MSG_RESULT([no])])
 AC_LANG_POP([C++])
 
-AC_MSG_CHECKING([whether $CXX_BASE defines __cxa_exceptions in cxxabi.h])
+AC_MSG_CHECKING([whether $CXX_BASE defines __cxa_exception in cxxabi.h])
 AC_LANG_PUSH([C++])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include 
 #include 
-std::size_t f() { return sizeof(__cxxabiv1::__cxa_exceptions); }
+std::size_t f() { return sizeof(__cxxabiv1::__cxa_exception); }
 ])], [
-AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTIONS],[1])
+AC_DEFINE([HAVE_CXXABI_H_CXA_EXCEPTION],[1])
 AC_MSG_RESULT([yes])
 ], [AC_MSG_RESULT([no])])
 AC_LANG_POP([C++])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source configure.ac

2017-06-23 Thread brainbreaker 
 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(-)

New commits:
commit 3bb8ec7cc5c1dba74216ea42b94bf2284bf286d0
Author: brainbreaker 
Date:   Wed Jun 21 17:30:40 2017 +0530

android: Fix bridges/ module for building with Clang

Change-Id: If8bcda3aa8c3a3e46cd98e5ae797486f32db9822
Reviewed-on: https://gerrit.libreoffice.org/39050
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

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 
 #include 
 #include 
-#include 
+#include 
 
 #include 
 #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
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bridges/source configure.ac desktop/source jvmfwk/plugins

2014-08-21 Thread Caolán McNamara 
 bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |   17 ++--
 configure.ac|7 ++
 desktop/source/deployment/misc/dp_platform.cxx  |3 ++
 jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx|6 -
 4 files changed, 26 insertions(+), 7 deletions(-)

New commits:
commit 170109708e6a082252efba3d2f1726bbd82b6452
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Aug 21 08:52:16 2014 +0100

Related: rhbz#1125588 first steps for ppc64le

almost certainly won't get us too far, but a start

Change-Id: Ic20b97a97b6d506c32322173bd8332d15c3a4555

diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx 
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index a4a08c5..1190507 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -31,6 +31,11 @@
 #include stdio.h
 #include string.h
 
+#ifdef OSL_BIGENDIAN
+#define IS_BIG_ENDIAN 1
+#else
+#define IS_BIG_ENDIAN 0
+#endif
 
 using namespace ::com::sun::star::uno;
 
@@ -139,13 +144,13 @@ static typelib_TypeClass cpp2uno_call(
 case typelib_TypeClass_BOOLEAN:
 if (ng  ppc64::MAX_GPR_REGS)
 {
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) + 
(sizeof(void*)-1));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) + 
7*IS_BIG_ENDIAN);
 ng++;
 gpreg++;
 }
 else
 {
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + 
(sizeof(void*)-1));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + 
7*IS_BIG_ENDIAN);
 bOverflowUsed = true;
 }
 if (bOverflowUsed) ovrflw++;
@@ -155,13 +160,13 @@ static typelib_TypeClass cpp2uno_call(
 case typelib_TypeClass_UNSIGNED_SHORT:
 if (ng  ppc64::MAX_GPR_REGS)
 {
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) + 
(sizeof(void*)-2));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) + 
6*IS_BIG_ENDIAN);
 ng++;
 gpreg++;
 }
 else
 {
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + 
(sizeof(void*)-2));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + 
6*IS_BIG_ENDIAN);
 bOverflowUsed = true;
 }
 if (bOverflowUsed) ovrflw++;
@@ -171,13 +176,13 @@ static typelib_TypeClass cpp2uno_call(
 case typelib_TypeClass_UNSIGNED_LONG:
 if (ng  ppc64::MAX_GPR_REGS)
 {
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) + 
(sizeof(void*)-4));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)gpreg) + 
4*IS_BIG_ENDIAN);
 ng++;
 gpreg++;
 }
 else
 {
-pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + 
(sizeof(void*)-4));
+pCppArgs[nPos] = pUnoArgs[nPos] = (((char *)ovrflw) + 
4*IS_BIG_ENDIAN);
 bOverflowUsed = true;
 }
 if (bOverflowUsed) ovrflw++;
diff --git a/configure.ac b/configure.ac
index bc823c7..ac3051d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4380,6 +4380,13 @@ linux-gnu*)
 PLATFORMID=linux_powerpc64
 OUTPATH=unxlngppc64
 ;;
+powerpc64le)
+CPUNAME=POWERPC64
+RTL_ARCH=PowerPC_64_LE
+LIB64=lib64
+PLATFORMID=linux_powerpc64le
+OUTPATH=unxlngppc64
+;;
 sparc)
 CPUNAME=SPARC
 RTL_ARCH=SPARC
diff --git a/desktop/source/deployment/misc/dp_platform.cxx 
b/desktop/source/deployment/misc/dp_platform.cxx
index 6b5215a..6e69359 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -35,6 +35,7 @@
 #define PLATFORM_LINUX_SPARClinux_sparc
 #define PLATFORM_LINUX_POWERPC  linux_powerpc
 #define PLATFORM_LINUX_POWERPC64linux_powerpc64
+#define PLATFORM_LINUX_POWERPC64_LE linux_powerpc64_le
 #define PLATFORM_LINUX_ARM_EABI linux_arm_eabi
 #define PLATFORM_LINUX_ARM_OABI linux_arm_oabi
 #define PLATFORM_LINUX_MIPS_EL  linux_mips_el
@@ -129,6 +130,8 @@ namespace
 ret = checkOSandCPU(Linux, PowerPC);
 else if (token == PLATFORM_LINUX_POWERPC64)
 ret = checkOSandCPU(Linux, PowerPC_64);
+else if (token == PLATFORM_LINUX_POWERPC64_LE)
+ret =