[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108758: unexmacosx.c (copy_data_segment): Added two section names used on Mac

[jwiegley]

------------------------------------------------------------
revno: 108758
committer: address@hidden
branch nick: trunk
timestamp: Tue 2012-06-26 22:52:02 -0500
message:
  unexmacosx.c (copy_data_segment): Added two section names used on Mac
  OS X Lion: __mod_init_func and __mod_term_func.
modified:
  src/ChangeLog
  src/unexmacosx.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-27 03:49:35 +0000
+++ b/src/ChangeLog     2012-06-27 03:52:02 +0000
@@ -1,5 +1,8 @@
 2012-06-26  John Wiegley  <address@hidden>
 
+       * 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  <address@hidden>
+
+       * gnutls.c (emacs_gnutls_handshake): Only retry if
+       GNUTLS_E_INTERRUPTED.
+
 2012-06-23  Eli Zaretskii  <address@hidden>
 
        * dispnew.c (sit_for, Fsleep_for):

=== modified file 'src/unexmacosx.c'
--- a/src/unexmacosx.c  2012-06-24 17:39:14 +0000
+++ b/src/unexmacosx.c  2012-06-27 03:52:02 +0000
@@ -846,6 +846,8 @@
               || 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))