diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-11-17 11:34:33 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-11-17 11:34:33 +0000 |
| commit | d846e425c90211f07c13797880a4a0cd94879440 (patch) | |
| tree | b8773c0b6507e14a7e7f8e1f8bd8affa4007d313 /libitm | |
| parent | 1502e1556c87fb727fe0360f1f2703425d7aa455 (diff) | |
| download | gcc-d846e425c90211f07c13797880a4a0cd94879440.tar.gz | |
Provide all dummy functions in alloc_cpp.cc, eh_cpp.cc
* alloc_cpp.cc [__osf__] (_ZnwX, _ZdlPv, _ZnaX, _ZdaPv,
_ZnwXRKSt9nothrow_t, _ZdlPvRKSt9nothrow_t, _ZdaPvRKSt9nothrow_t):
Dummy functions.
* eh_cpp.cc [__osf__] (__cxa_allocate_exception, __cxa_throw,
__cxa_begin_catch, __cxa_end_catch, __cxa_tm_cleanup): Likewise.
From-SVN: r181442
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 8 | ||||
| -rw-r--r-- | libitm/alloc_cpp.cc | 14 | ||||
| -rw-r--r-- | libitm/eh_cpp.cc | 8 |
3 files changed, 25 insertions, 5 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 3a0ffe7b0ec..19e9fe38630 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,11 @@ +2011-11-17 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * alloc_cpp.cc [__osf__] (_ZnwX, _ZdlPv, _ZnaX, _ZdaPv, + _ZnwXRKSt9nothrow_t, _ZdlPvRKSt9nothrow_t, _ZdaPvRKSt9nothrow_t): + Dummy functions. + * eh_cpp.cc [__osf__] (__cxa_allocate_exception, __cxa_throw, + __cxa_begin_catch, __cxa_end_catch, __cxa_tm_cleanup): Likewise. + 2011-11-16 Uros Bizjak <ubizjak@gmail.com> PR bootstrap/51098 diff --git a/libitm/alloc_cpp.cc b/libitm/alloc_cpp.cc index 4e535513cd5..d298bd49e82 100644 --- a/libitm/alloc_cpp.cc +++ b/libitm/alloc_cpp.cc @@ -61,11 +61,15 @@ extern void *_ZnaXRKSt9nothrow_t (size_t, c_nothrow_p) __attribute__((weak)); extern void _ZdaPvRKSt9nothrow_t (void *, c_nothrow_p) __attribute__((weak)); #ifdef __osf__ /* Really: !HAVE_WEAKDEF */ -void * -_ZnaXRKSt9nothrow_t (size_t, c_nothrow_p) -{ - return NULL; -} +void *_ZnwX (size_t) { return NULL; } +void _ZdlPv (void *) { return; } +void *_ZnaX (size_t) { return NULL; } +void _ZdaPv (void *) { return; } + +void *_ZnwXRKSt9nothrow_t (size_t, c_nothrow_p) { return NULL; } +void _ZdlPvRKSt9nothrow_t (void *, c_nothrow_p) { return; } +void *_ZnaXRKSt9nothrow_t (size_t, c_nothrow_p) { return NULL; } +void _ZdaPvRKSt9nothrow_t (void *, c_nothrow_p) { return; } #endif /* __osf__ */ /* Wrap the delete nothrow symbols for usage with a single argument. diff --git a/libitm/eh_cpp.cc b/libitm/eh_cpp.cc index 7cba97cc48c..7a378622772 100644 --- a/libitm/eh_cpp.cc +++ b/libitm/eh_cpp.cc @@ -39,6 +39,14 @@ extern void *__cxa_begin_catch (void *) WEAK; extern void *__cxa_end_catch (void) WEAK; extern void __cxa_tm_cleanup (void *, void *, unsigned int) WEAK; +#ifdef __osf__ /* Really: !HAVE_WEAKDEF */ +void *__cxa_allocate_exception (size_t) { return NULL; } +void __cxa_throw (void *, void *, void *) { return; } +void *__cxa_begin_catch (void *) { return NULL; } +void *__cxa_end_catch (void) { return NULL; } +void __cxa_tm_cleanup (void *, void *, unsigned int) { return; } +#endif + } |