diff options
| author | Iain Sandoe <iains@gcc.gnu.org> | 2012-02-15 23:39:28 +0000 |
|---|---|---|
| committer | Patrick Marlier <pmarlier@gcc.gnu.org> | 2012-02-15 23:39:28 +0000 |
| commit | e948a1fbd4dc864dfb5ff9e5511e03c630416e5a (patch) | |
| tree | 6b555950db9f790ccbc9a8b2d3739d727cd63bb2 /libitm | |
| parent | e3a66c388451d35712a345ee98fb242b116caf10 (diff) | |
| download | gcc-e948a1fbd4dc864dfb5ff9e5511e03c630416e5a.zip gcc-e948a1fbd4dc864dfb5ff9e5511e03c630416e5a.tar.gz gcc-e948a1fbd4dc864dfb5ff9e5511e03c630416e5a.tar.bz2 | |
re PR libitm/52220 (FAIL: libitm.c++/eh-1.C execution test due to Xcode 4 weakref linker bug)
libitm/
2012-02-15 Iain Sandoe <iains@gcc.gnu.org>
Patrick Marlier <patrick.marlier@gmail.com>
PR libitm/52220
* alloc_cpp.cc: No dummy definitions for darwin.
* eh_cpp.cc: Likewise.
libgcc/
2012-02-15 Iain Sandoe <iains@gcc.gnu.org>
Patrick Marlier <patrick.marlier@gmail.com>
PR libitm/52220
* config/darwin-crt-tm.c: Generate dummy functions.
Co-Authored-By: Patrick Marlier <patrick.marlier@gmail.com>
From-SVN: r184293
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 7 | ||||
| -rw-r--r-- | libitm/alloc_cpp.cc | 2 | ||||
| -rw-r--r-- | libitm/eh_cpp.cc | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 3b54c8b..e103ca0 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,10 @@ +2012-02-15 Iain Sandoe <iains@gcc.gnu.org> + Patrick Marlier <patrick.marlier@gmail.com> + + PR libitm/52220 + * alloc_cpp.cc: No dummy definitions for darwin. + * eh_cpp.cc: Likewise. + 2012-02-14 Richard Henderson <rth@redhat.com> * config/x86/target.h (GTM_longjmp): Correct the .cfi corrections. diff --git a/libitm/alloc_cpp.cc b/libitm/alloc_cpp.cc index 0789b2e..00a4d32 100644 --- a/libitm/alloc_cpp.cc +++ b/libitm/alloc_cpp.cc @@ -60,7 +60,7 @@ extern void _ZdlPvRKSt9nothrow_t (void *, c_nothrow_p) __attribute__((weak)); extern void *_ZnaXRKSt9nothrow_t (size_t, c_nothrow_p) __attribute__((weak)); extern void _ZdaPvRKSt9nothrow_t (void *, c_nothrow_p) __attribute__((weak)); -#if !defined (HAVE_ELF_STYLE_WEAKREF) +#if !defined (HAVE_ELF_STYLE_WEAKREF) && !defined (__MACH__) void *_ZnwX (size_t) { return NULL; } void _ZdlPv (void *) { return; } void *_ZnaX (size_t) { return NULL; } diff --git a/libitm/eh_cpp.cc b/libitm/eh_cpp.cc index 352a313..5c4ca28 100644 --- a/libitm/eh_cpp.cc +++ b/libitm/eh_cpp.cc @@ -39,7 +39,7 @@ extern void *__cxa_begin_catch (void *) WEAK; extern void *__cxa_end_catch (void) WEAK; extern void __cxa_tm_cleanup (void *, void *, unsigned int) WEAK; -#if !defined (HAVE_ELF_STYLE_WEAKREF) +#if !defined (HAVE_ELF_STYLE_WEAKREF) && !defined (__MACH__) void *__cxa_allocate_exception (size_t) { return NULL; } void __cxa_throw (void *, void *, void *) { return; } void *__cxa_begin_catch (void *) { return NULL; } |