Merge from emacs--rel--22

[gnu-emacs] / src / m / intel386.h

diff --git a/src/m/intel386.h b/src/m/intel386.h
index 680a2cc106d5b653a3994153ff7b70fa20ee74d7..810ec6239a8be4936b99c9f71e7a82aebba77eda 100644 (file)
--- 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) */