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 d0e226db5ddd53e048732c24bd28111b0333785c..bef3bbd4c83a92a73592088cd5edc3af5fa4b3c8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-06-26  John Wiegley  <johnw@newartisans.com>
 
+       * 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 <http://bugs.gnu.org/9000#51>.
 
+2012-06-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * gnutls.c (emacs_gnutls_handshake): Only retry if
+       GNUTLS_E_INTERRUPTED.
+
 2012-06-23  Eli Zaretskii  <eliz@gnu.org>
 
        * dispnew.c (sit_for, Fsleep_for):

diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 47efe41fdd9cae6d741881334417a95892d54c1f..423853c8139925a858ac4481d7e06cc3c93f4432 100644 (file)
--- 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))