Thu Sep 15 22:06:39 2011 UTC ()

Copy __got section when copying data segment on Mac OS X.

Patch provided by Tom Yu in PR 45240.


(minskim)

diff -r1.50 -r1.51 pkgsrc/editors/emacs/distinfo
diff -r0 -r1.1 pkgsrc/editors/emacs/patches/patch-src_unexmacosx.c

--- pkgsrc/editors/emacs/Attic/distinfo 2011/09/12 22:31:58 1.50
+++ pkgsrc/editors/emacs/Attic/distinfo 2011/09/15 22:06:38 1.51

 @@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.50 2011/09/12 22:31:58 wiz Exp $
+$NetBSD: distinfo,v 1.51 2011/09/15 22:06:38 minskim Exp $
 SHA1 (emacs-23.3a.tar.gz) = d9fa8d121577dddb192297b8caa55cb8123e2e8a
 RMD160 (emacs-23.3a.tar.gz) = 47104bebe70c509b82fd469bab0dea07e9e10fef
 Size (emacs-23.3a.tar.gz) = 47948683 bytes
 SHA1 (patch-aa) = 951c1d9fe90fbe2c2366ba230106f8d165068d50
 SHA1 (patch-ab) = 053243431964def524b7ba2f82ee78680ff7011e
 SHA1 (patch-ad) = e37f73048273801b8fd330d6897346b1f6e55fe9
 SHA1 (patch-ae) = 116394051b3e2f4220ff5a3de3402923857940b9
 SHA1 (patch-ag) = f462ad22762469360d90060afbc73e660e9f7db5
 SHA1 (patch-bf) = 9ff58581e7b9c865397729169fadd3baecc4a1e3
 SHA1 (patch-src_unexmacosx.c) = 5821eb65c1e10192a7b2679691e4651b8d9fb263

$NetBSD: patch-src_unexmacosx.c,v 1.1 2011/09/15 22:06:38 minskim Exp $

Upstream git commit c8bba48c5889c4773c62a10f7c3d4383881f11c1.

--- src/unexmacosx.c.orig	2011-01-08 17:45:14.000000000 +0000
+++ src/unexmacosx.c
@@ -823,6 +823,7 @@ copy_data_segment (struct load_command *
       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
 	       || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
 	       || strncmp (sectp->sectname, "__la_sym_ptr2", 16) == 0
+	       || strncmp (sectp->sectname, "__got", 16) == 0
 	       || strncmp (sectp->sectname, "__dyld", 16) == 0
 	       || strncmp (sectp->sectname, "__const", 16) == 0
 	       || strncmp (sectp->sectname, "__cfstring", 16) == 0