diff options
author | Ben Cheng <bccheng@android.com> | 2013-04-02 19:52:55 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-02 20:36:40 +0800 |
commit | 4e9989f243cd0a5d51f76e6ce98828c7cb6b9246 (patch) | |
tree | f344226fc3e55b384d5fa9a2808ae0bc1449bdb8 /gcc-4.8 | |
parent | 9c289590d1f9e5c75fc4e7ba33ab4a86244972a9 (diff) | |
download | toolchain_gcc-4e9989f243cd0a5d51f76e6ce98828c7cb6b9246.tar.gz toolchain_gcc-4e9989f243cd0a5d51f76e6ce98828c7cb6b9246.tar.bz2 toolchain_gcc-4e9989f243cd0a5d51f76e6ce98828c7cb6b9246.zip |
[4.8] Use default visibility for the __cxa functions in eh_arm.cc.
Change-Id: I6f4b9adba43aa366c5107c8644a7a2afc840d193
Diffstat (limited to 'gcc-4.8')
-rw-r--r-- | gcc-4.8/libstdc++-v3/libsupc++/eh_arm.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gcc-4.8/libstdc++-v3/libsupc++/eh_arm.cc b/gcc-4.8/libstdc++-v3/libsupc++/eh_arm.cc index a91405ef4..03c157b52 100644 --- a/gcc-4.8/libstdc++-v3/libsupc++/eh_arm.cc +++ b/gcc-4.8/libstdc++-v3/libsupc++/eh_arm.cc @@ -29,6 +29,16 @@ using namespace __cxxabiv1; +// The GCC command-line option "-fvisibility=hidden" apparently fails to hide +// the visibility of the inline assembly function "__cxa_end_cleanup". +// We need to keep the visibility of the __cxa_* functions coherent otherwise +// linking eh_arm.o to resolve __cxa_end_cleanup (eg needed by -frtti +// -fexceptions) will disappoint the linker by exposing __cxa_type_match and +// __cxa_begin_cleanup (eg needed by __aeabi_idiv from libgcc.a). +// Therefore as a simple workaround we just force the visibility to default for +// all these __cxa functions in this module. + +#pragma GCC visibility push(default) // Given the thrown type THROW_TYPE, exception object UE_HEADER and a // type CATCH_TYPE to compare against, return whether or not there is @@ -224,4 +234,6 @@ asm (" .pushsection .text.__cxa_end_cleanup\n" #endif #endif +#pragma GCC visibility pop + #endif |