• Stephan Bergmann's avatar
    Switch Android armeabi-v7a to libc++/libc++abi/libunwind too · aa448403
    Stephan Bergmann yazdı
    It had been left out in 4082a184 "android: use
    unified headers and llvm-c++ STL (x86) with NDK 16" because "arm unfortunately
    crashes with llvm-c++, so keep with gnustl for now/fix that later".
    
    Making armeabi-v7a work with libc++ etc. required a number of changes, listed
    below, in this commit and in preceding ones.  At least 32-bit x86 already worked
    with libc++ etc. prior to these changes in view mode, though it crashed in the
    experimental editing mode (enabled with strippedUIEditing in
    android/soruce/Makefile) as soon as one types in something,  But it is not
    entirely clear to me why 32-bit x86 view mode didn't also fail similar to how I
    saw armeabi-v7a fail.  (On 32-bit x86, these changes appear to neither improve
    nor worsen the current state, view mode still appears to work fine while editing
    still crashes upon typing anything.  With these changes, editing mode on
    armeabi-v7a appears to work fine.  But I tested armeabi-v7a only with a real
    device and 32-bit x86 only with an emulator, in case that might make a
    difference.)
    
    * Preceding <https://gerrit.libreoffice.org/#/c/64964/> "Move NSSLIBS to a more
      sensible place on the linker command line" plus this change's addition of
      -lunwind to the liblo-native-code.so linker command line make sure that
      liblo-native-code.so uses _Unwind_* functions from libunwind.a, instead of
      erroneously picking up the ones from libgcc.a that happen to be included in
      NSSLIB's nspr4 (-lgcc is automatically added to the end of the linker command
      line by the invoking compiler, that's how libgcc.a's _Unwind_* end up in
      NSSLIB's nspr4; it is neither clear to me why NSSLIB's nspr4, being a pure C
      library, uses _Unwind_* functions, nor why exception handling in
      liblo-native-code.so fails when using _Unwind_* functions from libgcc.a
      instead of from libunwind on armeabi-v7a, nor why that would work on 32-bit
      x86, but that's what I observed: ModuleManager::identify
      (framework/source/services/modulemanager.cxx) throws a
      css::lang::IllegalArgumentException, which calls __cxa_throw ->
      _Unwind_RaiseException, which ultimately lead to odd misbehavior and
      std::abort during stack unwinding when using _Unwind_RaiseException from
      libgcc.a instead of from libunwind).  (There is no libunwind.* in
      android-ndk-r16b for 32-bit x86 at least, so is presumably using _Unwind_*
      functions from libgcc.a.  It doesn't appear to make a difference if it
      indirectly uses those _Unwind_* functions from NSSLIB's nspr4, or directly
      from libgcc.a included in liblo-native-code.so if the
    
        $(if $(filter armeabi-v7a,$(ANDROID_APP_ABI)),-lunwind)
    
      had a ",-lgcc" else branch.)
    
    * Preceding <https://gerrit.libreoffice.org/#/c/64965/> "Export RTTI symbols
      from liblo-native-code.so, for binary UNO bridge" makes sure that excpetions
      thrown from the binary UNO bridge can be caught by compiled catch clauses.
      Not sure why the corresponding state of
      bridges/source/cpp_uno/gcc3_linux_intel shouldn't have run into the same
      issue.
    
    * Preceding <https://gerrit.libreoffice.org/#/c/64966/> "Adapt gcc3_linux_arm
      __cxa_exception to NDK 18 libc++abi" makes sure that our version of
      __cxa_exception matches the version from libc++abi.  This is clearly not
      relevant for 32-bit x86.  (The comment there android-ndk-r18b, but the
      additional member is already present in
      android-ndk-r16b/sources/cxx-stl/llvm-libc++abi/src/cxa_exception.hpp, too.)
    
    The remainder of this change just drops old armeabi-v7a--specific workarounds
    that are no longer needed/no longer work.
    
    Change-Id: Ief4c2d562c5032abe6c3b94ca3b3394be6fcd4d3
    Reviewed-on: https://gerrit.libreoffice.org/64973Tested-by: 's avatarStephan Bergmann <sbergman@redhat.com>
    Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
    aa448403
Adı
Son kayıt (commit)
Son güncelleme
.git-hooks Loading commit data...
UnoControls Loading commit data...
accessibility Loading commit data...
android Loading commit data...
animations Loading commit data...
apple_remote Loading commit data...
avmedia Loading commit data...
basctl Loading commit data...
basegfx Loading commit data...
basic Loading commit data...
bean Loading commit data...
bin Loading commit data...
binaryurp Loading commit data...
bridges Loading commit data...
canvas Loading commit data...
chart2 Loading commit data...
cli_ure Loading commit data...
codemaker Loading commit data...
comphelper Loading commit data...
compilerplugins Loading commit data...
config_host Loading commit data...
configmgr Loading commit data...
connectivity Loading commit data...
cppcanvas Loading commit data...
cppu Loading commit data...
cppuhelper Loading commit data...
cpputools Loading commit data...
cui Loading commit data...
dbaccess Loading commit data...
desktop Loading commit data...
dictionaries @ de575684
distro-configs Loading commit data...
drawinglayer Loading commit data...
dtrans Loading commit data...
editeng Loading commit data...
embeddedobj Loading commit data...
embedserv Loading commit data...
emfio Loading commit data...
eventattacher Loading commit data...
extensions Loading commit data...
external Loading commit data...
extras Loading commit data...
filter Loading commit data...
forms Loading commit data...
formula Loading commit data...
fpicker Loading commit data...
framework Loading commit data...
helpcompiler Loading commit data...
helpcontent2 @ 4fcc8606
hwpfilter Loading commit data...
i18nlangtag Loading commit data...
i18npool Loading commit data...
i18nutil Loading commit data...
icon-themes Loading commit data...
idl Loading commit data...
idlc Loading commit data...
include Loading commit data...
instsetoo_native Loading commit data...
io Loading commit data...
ios Loading commit data...
javaunohelper Loading commit data...
jurt Loading commit data...
jvmaccess Loading commit data...
jvmfwk Loading commit data...
l10ntools Loading commit data...
librelogo Loading commit data...
libreofficekit Loading commit data...
lingucomponent Loading commit data...
linguistic Loading commit data...
lotuswordpro Loading commit data...
m4 Loading commit data...
nlpsolver Loading commit data...
o3tl Loading commit data...
odk Loading commit data...
offapi Loading commit data...
officecfg Loading commit data...
onlineupdate Loading commit data...
oovbaapi Loading commit data...
oox Loading commit data...
opencl Loading commit data...
osx Loading commit data...
package Loading commit data...
postprocess Loading commit data...
pyuno Loading commit data...
qadevOOo Loading commit data...
readlicense_oo Loading commit data...
registry Loading commit data...
remotebridges Loading commit data...
reportbuilder Loading commit data...
reportdesign Loading commit data...
ridljar Loading commit data...
sal Loading commit data...
salhelper Loading commit data...
sax Loading commit data...
sc Loading commit data...
scaddins Loading commit data...
sccomp Loading commit data...
schema Loading commit data...
scp2 Loading commit data...
scripting Loading commit data...
sd Loading commit data...
sdext Loading commit data...
setup_native Loading commit data...
sfx2 Loading commit data...
shell Loading commit data...
slideshow Loading commit data...
smoketest Loading commit data...
solenv Loading commit data...
soltools Loading commit data...
sot Loading commit data...
starmath Loading commit data...
stoc Loading commit data...
store Loading commit data...
svgio Loading commit data...
svl Loading commit data...
svtools Loading commit data...
svx Loading commit data...
sw Loading commit data...
swext Loading commit data...
sysui Loading commit data...
test Loading commit data...
testtools Loading commit data...
toolkit Loading commit data...
tools Loading commit data...
translations @ f0e72c6a
ucb Loading commit data...
ucbhelper Loading commit data...
udkapi Loading commit data...
uitest Loading commit data...
unodevtools Loading commit data...
unoidl Loading commit data...
unoil Loading commit data...
unotest Loading commit data...
unotools Loading commit data...
unoxml Loading commit data...
ure Loading commit data...
uui Loading commit data...
vbahelper Loading commit data...
vcl Loading commit data...
winaccessibility Loading commit data...
wizards Loading commit data...
writerfilter Loading commit data...
writerperfect Loading commit data...
xmerge Loading commit data...
xmlhelp Loading commit data...
xmloff Loading commit data...
xmlreader Loading commit data...
xmlscript Loading commit data...
xmlsecurity Loading commit data...
.buckconfig Loading commit data...
.buckversion Loading commit data...
.clang-format Loading commit data...
.editorconfig Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
.gitreview Loading commit data...
BUCK Loading commit data...
COPYING Loading commit data...
COPYING.LGPL Loading commit data...
COPYING.MPL Loading commit data...
Library_merged.mk Loading commit data...
Makefile.fetch Loading commit data...
Makefile.gbuild Loading commit data...
Makefile.in Loading commit data...
README.Solaris Loading commit data...
README.cross Loading commit data...
README.md Loading commit data...
Repository.mk Loading commit data...
RepositoryExternal.mk Loading commit data...
RepositoryFixes.mk Loading commit data...
RepositoryModule_build.mk Loading commit data...
RepositoryModule_host.mk Loading commit data...
TEMPLATE.SOURCECODE.HEADER Loading commit data...
autogen.sh Loading commit data...
config.guess Loading commit data...
config.sub Loading commit data...
config_host.mk.in Loading commit data...
config_host_lang.mk.in Loading commit data...
configure.ac Loading commit data...
download.lst Loading commit data...
g Loading commit data...
install-sh Loading commit data...
leak-suppress.txt Loading commit data...
lo.xcent.in Loading commit data...
logerrit Loading commit data...
sanitize-ubsan-blacklist Loading commit data...