diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-09-27 22:27:49 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-09-27 23:52:22 +0300 |
commit | 9f5227d66bfca9dd2ffc338f68001ad6ba3b485d (patch) | |
tree | 63be70bee1d5c72707740d1c6d6f6e10061f384c /bridges/Library_gcc3_macosx_x86-64.mk | |
parent | 6beb0d37b03253be3aa42189b9995b512d9d8f72 (diff) |
Make exceptions work better in the x86-64 MacOSX C++-UNO bridge
Putting the privateSnippetExecutor() assembly code as inline asm
inside an otherwise empty C++ function helps, for some reason.
Use the actual _Unwnd_Exception and __cxa_exception definitions as
used by Apple (from opensource.apple.com libunwind and libcppabi
sources) instead of guessing.
Change-Id: I1ef22a9c0c664d3a357b9a6474406141f53cc490
Diffstat (limited to 'bridges/Library_gcc3_macosx_x86-64.mk')
-rw-r--r-- | bridges/Library_gcc3_macosx_x86-64.mk | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/bridges/Library_gcc3_macosx_x86-64.mk b/bridges/Library_gcc3_macosx_x86-64.mk index b7b69c474487..309d672092e7 100644 --- a/bridges/Library_gcc3_macosx_x86-64.mk +++ b/bridges/Library_gcc3_macosx_x86-64.mk @@ -46,12 +46,9 @@ $(eval $(call gb_Library_use_libraries,gcc3_uno,\ sal \ )) -$(eval $(call gb_Library_add_asmobjects,gcc3_uno,\ - bridges/source/cpp_uno/gcc3_macosx_x86-64/call \ -)) - $(eval $(call gb_Library_add_exception_objects,gcc3_uno,\ bridges/source/cpp_uno/gcc3_macosx_x86-64/abi \ + bridges/source/cpp_uno/gcc3_macosx_x86-64/call \ bridges/source/cpp_uno/gcc3_macosx_x86-64/callvirtualmethod \ bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno \ bridges/source/cpp_uno/gcc3_macosx_x86-64/except \ |