summaryrefslogtreecommitdiff
path: root/libitm
diff options
context:
space:
mode:
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2013-02-11 23:30:10 +0000
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>2013-02-11 23:30:10 +0000
commit48b8e70a4490e737d6e7b8f08ec241deeb357589 (patch)
tree206424d4d1c1346a99945c5b45e70d6fc3fbcec5 /libitm
parenta88d408f5e9b70170e8d92b4de28986c9e5dbc20 (diff)
downloadgcc-48b8e70a4490e737d6e7b8f08ec241deeb357589.tar.gz
/libgcc
2013-02-11 Iain Sandoe <iain@codesourcery.com> Jack Howarth <howarth@bromo.med.uc.edu> Patrick Marlier <patrick.marlier@gmail.com> PR libitm/55693 * config/darwin-crt-tm.c: Remove dummy functions hack. /gcc 2013-02-11 Iain Sandoe <iain@codesourcery.com> Jack Howarth <howarth@bromo.med.uc.edu> Patrick Marlier <patrick.marlier@gmail.com> PR libitm/55693 * config/darwin.h: Replace ENDFILE_SPEC with TM_DESTRUCTOR and define ENDFILE_SPEC as TM_DESTRUCTOR. * config/i386/darwin.h (ENDFILE_SPEC): Use TM_DESTRUCTOR. /libitm 2013-02-11 Iain Sandoe <iain@codesourcery.com> Jack Howarth <howarth@bromo.med.uc.edu> Patrick Marlier <patrick.marlier@gmail.com> PR libitm/55693 * alloc_cpp.cc: Enable function declarations on darwin. * eh_cpp.cc: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195960 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libitm')
-rw-r--r--libitm/ChangeLog8
-rw-r--r--libitm/alloc_cpp.cc2
-rw-r--r--libitm/eh_cpp.cc2
3 files changed, 10 insertions, 2 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 56423c353fc..a0e3c521a94 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-11 Iain Sandoe <iain@codesourcery.com>
+ Jack Howarth <howarth@bromo.med.uc.edu>
+ Patrick Marlier <patrick.marlier@gmail.com>
+
+ PR libitm/55693
+ * alloc_cpp.cc: Enable function declarations on darwin.
+ * eh_cpp.cc: Likewise.
+
2013-02-03 Richard Sandiford <rdsandiford@googlemail.com>
Update copyright years.
diff --git a/libitm/alloc_cpp.cc b/libitm/alloc_cpp.cc
index 654b94209f6..a65d01df66e 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) && !defined (__MACH__)
+#if !defined (HAVE_ELF_STYLE_WEAKREF)
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 00eac5f7864..929053d331a 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) && !defined (__MACH__)
+#if !defined (HAVE_ELF_STYLE_WEAKREF)
void *__cxa_allocate_exception (size_t) { return NULL; }
void __cxa_throw (void *, void *, void *) { return; }
void *__cxa_begin_catch (void *) { return NULL; }