aboutsummaryrefslogtreecommitdiff
path: root/libitm/alloc_cpp.cc
diff options
context:
space:
mode:
authorIain Sandoe <iains@gcc.gnu.org>2012-02-15 23:39:28 +0000
committerPatrick Marlier <pmarlier@gcc.gnu.org>2012-02-15 23:39:28 +0000
commite948a1fbd4dc864dfb5ff9e5511e03c630416e5a (patch)
tree6b555950db9f790ccbc9a8b2d3739d727cd63bb2 /libitm/alloc_cpp.cc
parente3a66c388451d35712a345ee98fb242b116caf10 (diff)
downloadgcc-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/alloc_cpp.cc')
-rw-r--r--libitm/alloc_cpp.cc2
1 files changed, 1 insertions, 1 deletions
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; }