aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Sandoe <iains@gcc.gnu.org>2012-02-16 09:46:31 +0000
committerIain Sandoe <iains@gcc.gnu.org>2012-02-16 09:46:31 +0000
commit672ed3139a0c2aced7c702f3ce4b26dd34672dd2 (patch)
tree8167db82f66a931b37c4254be1523a612c6424c0
parent04c937f581e817069fa8f8c8e724097057b08c43 (diff)
downloadgcc-672ed3139a0c2aced7c702f3ce4b26dd34672dd2.zip
gcc-672ed3139a0c2aced7c702f3ce4b26dd34672dd2.tar.gz
gcc-672ed3139a0c2aced7c702f3ce4b26dd34672dd2.tar.bz2
re PR libitm/52220 (FAIL: libitm.c++/eh-1.C execution test due to Xcode 4 weakref linker bug)
PR libitm/52220 * config/darwin-crt-tm.c: Correct typo. From-SVN: r184305
-rw-r--r--libgcc/ChangeLog5
-rw-r--r--libgcc/config/darwin-crt-tm.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index fef5b6d..01a3ac2 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,4 +1,9 @@
2012-02-15 Iain Sandoe <iains@gcc.gnu.org>
+
+ PR libitm/52220
+ * config/darwin-crt-tm.c: Correct typo.
+
+2012-02-15 Iain Sandoe <iains@gcc.gnu.org>
Patrick Marlier <patrick.marlier@gmail.com>
PR libitm/52220
diff --git a/libgcc/config/darwin-crt-tm.c b/libgcc/config/darwin-crt-tm.c
index 319b4f8..e905889 100644
--- a/libgcc/config/darwin-crt-tm.c
+++ b/libgcc/config/darwin-crt-tm.c
@@ -103,8 +103,6 @@ void __doTMdeRegistrations (void)
_ITM_deregisterTMCloneTable (tmct);
}
-#endif
-
/* Provide dummy functions to satisfy linkage for versions of the Darwin
tool-chain that that can't handle undefined weak refs at the link stage.
??? Define these dummy functions only when !HAVE_ELF_STYLE_WEAKREF. */
@@ -147,3 +145,4 @@ void *_ZnaXRKSt9nothrow_t (size_t s UNUSED, c_nothrow_p b UNUSED)
{ return NULL; }
void _ZdaPvRKSt9nothrow_t (void * a UNUSED, c_nothrow_p b UNUSED) { return; }
+#endif