2 files changed, 13 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 24a02d8d72b..64aebb22725 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-28  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * unexmacosx.c (print_load_command_name) [LC_DYLD_INFO]: Add cases
+        LC_DYLD_INFO and LC_DYLD_INFO_ONLY.
+        (copy_data_segment): Also copy __program_vars section.
+        (copy_dyld_info) [LC_DYLD_INFO]: New function.
+        (dump_it) [LC_DYLD_INFO]: Use it.
+
+        * s/darwin.h [temacs]: Undef HAVE_POSIX_MEMALIGN.
+
 2009-08-28  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in ($(BLD)/doc.$(O)): Depend on buildobj.h, not on
diff --git a/src/s/darwin.h b/src/s/darwin.h
index da223e9a41c..40aa5831994 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -171,6 +171,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define malloc unexec_malloc
 #define realloc unexec_realloc
 #define free unexec_free
+/* Don't use posix_memalign because it is not compatible with
+   unexmacosx.c.  */
+#undef HAVE_POSIX_MEMALIGN
 #endif
 
 /* The ncurses library has been moved out of the System framework in