From: John Wiegley Date: Wed, 27 Jun 2012 03:52:02 +0000 (-0500) Subject: unexmacosx.c (copy_data_segment): Added two section names used on Mac X-Git-Tag: emacs-24.2.90~1199^2~329 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=157e99e4284e376777fd22734b3c78c191cf313b;p=emacs.git unexmacosx.c (copy_data_segment): Added two section names used on Mac OS X Lion: __mod_init_func and __mod_term_func. --- diff --git a/src/ChangeLog b/src/ChangeLog index d0e226db5dd..bef3bbd4c83 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-06-26 John Wiegley + * unexmacosx.c (copy_data_segment): Added two section names used + on Mac OS X Lion: __mod_init_func and __mod_term_func. + * alloc.c (mark_memory): Do not check with -faddress-sanitizer when building with Clang. @@ -168,6 +171,11 @@ when time_t is unsigned and as wide as intmax_t. See . +2012-06-26 Andreas Schwab + + * gnutls.c (emacs_gnutls_handshake): Only retry if + GNUTLS_E_INTERRUPTED. + 2012-06-23 Eli Zaretskii * dispnew.c (sit_for, Fsleep_for): diff --git a/src/unexmacosx.c b/src/unexmacosx.c index 47efe41fdd9..423853c8139 100644 --- a/src/unexmacosx.c +++ b/src/unexmacosx.c @@ -846,6 +846,8 @@ copy_data_segment (struct load_command *lc) || strncmp (sectp->sectname, "__cfstring", 16) == 0 || strncmp (sectp->sectname, "__gcc_except_tab", 16) == 0 || strncmp (sectp->sectname, "__program_vars", 16) == 0 + || strncmp (sectp->sectname, "__mod_init_func", 16) == 0 + || strncmp (sectp->sectname, "__mod_term_func", 16) == 0 || strncmp (sectp->sectname, "__objc_", 7) == 0) { if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))