android/Bootstrap/Makefile.shared | 3 +-- bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-)
New commits: commit e465f9ae1749d118648408dca8935cdc13cd4cbd Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Dec 11 14:03:31 2018 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Dec 13 07:16:21 2018 +0100 Move NSSLIBS to a more sensible place on the linker command line 511ae02c6457e69cb6daab871acd9c3e7d64e2e3 "Android: Enable HAVE_FEATURE_NSS and package the NSS libraries with apk" had added them to WHOLELIBS probably just because that already had the $(addprefix -l,...), even though --whole-archive doesn't make any sense for shared libraries. Better place them later on the linker command line (after all our own archives and compiler support libraries), so that switching armeabi-v7a to libc++/libc++abi/libunwind (coming soon) will be able to override erroneously picking _Unwind_* symbols from NSSLIBS's nspr4 instead of libunwind. Change-Id: Ie0c0b7a55da3eabe1bb427232d698b2a4af63e78 Reviewed-on: https://gerrit.libreoffice.org/64964 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 0c9944efff0f..6807be9cc089 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -52,7 +52,6 @@ WHOLELIBS = \ -Wl,--whole-archive \ $(addprefix -l,$(strip \ juh \ - $(NSSLIBS) \ )) \ -Wl,--no-whole-archive @@ -60,7 +59,7 @@ WHOLELIBS = \ $(OBJLOCAL)/liblo-native-code.so : native-code.cxx $(ALL_STATIC_LIBS) @echo "Linking $@" mkdir -p $(OBJLOCAL) - $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lgnustl_static,-lc++_static -lc++abi -landroid_support) -lGLESv2 -landroid -ljnigraphics -llog -lz + $(CXX) -Wl,--build-id=sha1 -Wl,--gc-sections -Wl,--version-script=../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lgnustl_static,-lc++_static -lc++abi -landroid_support) $(addprefix -l,$(NSSLIBS)) -lGLESv2 -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) commit 9ff5ca9442e8a3f454d059ae2c62d94ca8d4f5ed Author: Stephan Bergmann <[email protected]> AuthorDate: Tue Dec 11 13:57:09 2018 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Dec 13 07:16:12 2018 +0100 Use declarations from cxxabi.h where available Change-Id: Ie92c9654c7ccc5cd4acde728b35311f251f740ac Reviewed-on: https://gerrit.libreoffice.org/64963 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx index d7b7ff370b52..a39fe26a97b8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx @@ -96,11 +96,15 @@ namespace CPPU_CURRENT_NAMESPACE // -- following decl from libstdc++-v3/libsupc++/unwind-cxx.h and unwind.h +#if !HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION extern "C" void *__cxa_allocate_exception( std::size_t thrown_size ) throw(); +#endif +#if !HAVE_CXXABI_H_CXA_THROW extern "C" void __cxa_throw ( void *thrown_exception, std::type_info *tinfo, void (*dest) (void *) ) __attribute__((noreturn)); +#endif } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
