Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1090

2 files changed, 11 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b85671a025..5e99294d879 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * m/intel386.h [MAC_OSX || DARWIN]: Define NO_ARG_ARRAY if _LP64.
+
 2008-02-29  Chong Yidong  <cyd@stupidchicken.com>
 
         * xdisp.c (next_overlay_string): Don't set
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 680a2cc106d..810ec6239a8 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -179,5 +179,12 @@ NOTE-END */
 #define SEGMENT_MASK ((SEGMENT_SIZE)-1)
 #endif
 
+#if defined (MAC_OSX) || defined (DARWIN)
+#ifdef _LP64
+/* For Intel Mac, with CC='gcc -arch x86_64'.  */
+#define NO_ARG_ARRAY
+#endif
+#endif
+
 /* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
    (do not change this comment) */