mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cxxabi.h is not specific to GCC

Browse Source 
Change-Id: Icaf4d4d41a36ae469f826ac08ab641a554dff3c9
This commit is contained in:
Stephan Bergmann
2016-02-25 20:27:59 +01:00
parent baad027bb7
commit 128deeae81
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
View File

@@ -29,7 +29,7 @@
#endif
#include <unwind.h>
#include "config_gcc.h"
#include "config_cxxabi.h"
#include <uno/any2.h>
#include "uno/mapping.h"
@@ -80,17 +80,17 @@ struct __cxa_eh_globals
// __cxa_allocate_exception and __cxa_throw, though they do not have the
// additional problem of an incompletely declared return type:
#if !HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS
#if !HAVE_CXXABI_H_CXA_GET_GLOBALS
namespace __cxxabiv1 { extern "C" void * __cxa_get_globals() throw(); }
#endif
#if !HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION
#if !HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION
namespace __cxxabiv1 {
extern "C" void * __cxa_allocate_exception(std::size_t thrown_size) throw();
}
#endif
#if !HAVE_GCC_CXXABI_H_CXA_THROW
#if !HAVE_CXXABI_H_CXA_THROW
namespace __cxxabiv1 {
extern "C" void __cxa_throw(
void * thrown_exception, void * tinfo, void (* dest)(void *))

8
bridges/source/cpp_uno/gcc3_linux_x86-64/share.hxx
View File

@@ -29,7 +29,7 @@
#endif
#include <unwind.h>
#include "config_gcc.h"
#include "config_cxxabi.h"
#include "uno/any2.h"
#include "uno/mapping.h"
@@ -104,17 +104,17 @@ struct __cxa_eh_globals
// __cxa_allocate_exception and __cxa_throw, though they do not have the
// additional problem of an incompletely declared return type:
#if !HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS
#if !HAVE_CXXABI_H_CXA_GET_GLOBALS
namespace __cxxabiv1 { extern "C" void * __cxa_get_globals() throw(); }
#endif
#if !HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION
#if !HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION
namespace __cxxabiv1 {
extern "C" void * __cxa_allocate_exception(std::size_t thrown_size) throw();
}
#endif
#if !HAVE_GCC_CXXABI_H_CXA_THROW
#if !HAVE_CXXABI_H_CXA_THROW
namespace __cxxabiv1 {
extern "C" void __cxa_throw(
void * thrown_exception, void * tinfo, void (* dest)(void *))

10
config_host/config_gcc.h.in → config_host/config_cxxabi.h.in
View File

@@ -7,12 +7,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef CONFIG_GCC_H
#define CONFIG_GCC_H
#ifndef CONFIG_CXXABI_H
#define CONFIG_CXXABI_H
#define HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION 0
#define HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS 0
#define HAVE_GCC_CXXABI_H_CXA_THROW 0
#define HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION 0
#define HAVE_CXXABI_H_CXA_GET_GLOBALS 0
#define HAVE_CXXABI_H_CXA_THROW 0
#endif

8
configure.ac
View File

@@ -6047,7 +6047,7 @@ if test "$GCC" = "yes"; then
#include <cxxabi.h>
void * f() { return __cxxabiv1::__cxa_allocate_exception(0); }
])], [
AC_DEFINE([HAVE_GCC_CXXABI_H_CXA_ALLOCATE_EXCEPTION],[1])
AC_DEFINE([HAVE_CXXABI_H_CXA_ALLOCATE_EXCEPTION],[1])
AC_MSG_RESULT([yes])
], [AC_MSG_RESULT([no])])
AC_LANG_POP([C++])
@@ -6058,7 +6058,7 @@ if test "$GCC" = "yes"; then
#include <cxxabi.h>
void * f() { return __cxxabiv1::__cxa_get_globals(); }
])], [
AC_DEFINE([HAVE_GCC_CXXABI_H_CXA_GET_GLOBALS],[1])
AC_DEFINE([HAVE_CXXABI_H_CXA_GET_GLOBALS],[1])
AC_MSG_RESULT([yes])
], [AC_MSG_RESULT([no])])
AC_LANG_POP([C++])
@@ -6069,7 +6069,7 @@ if test "$GCC" = "yes"; then
#include <cxxabi.h>
void f() { __cxxabiv1::__cxa_throw(0, 0, 0); }
])], [
AC_DEFINE([HAVE_GCC_CXXABI_H_CXA_THROW],[1])
AC_DEFINE([HAVE_CXXABI_H_CXA_THROW],[1])
AC_MSG_RESULT([yes])
], [AC_MSG_RESULT([no])])
AC_LANG_POP([C++])
@@ -12855,10 +12855,10 @@ AC_CONFIG_HEADERS([config_host/config_eot.h])
AC_CONFIG_HEADERS([config_host/config_extension_update.h])
AC_CONFIG_HEADERS([config_host/config_cairo_canvas.h])
AC_CONFIG_HEADERS([config_host/config_cups.h])
AC_CONFIG_HEADERS([config_host/config_cxxabi.h])
AC_CONFIG_HEADERS([config_host/config_dbus.h])
AC_CONFIG_HEADERS([config_host/config_features.h])
AC_CONFIG_HEADERS([config_host/config_folders.h])
AC_CONFIG_HEADERS([config_host/config_gcc.h])
AC_CONFIG_HEADERS([config_host/config_gio.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_graphite.h])