[Emacs-diffs] Changes to emacs/src/m/amdx86-64.h,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/08/25 20:12:49

Index: m/amdx86-64.h
===================================================================
RCS file: /sources/emacs/emacs/src/m/amdx86-64.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- m/amdx86-64.h       13 Aug 2007 13:40:53 -0000      1.17
+++ m/amdx86-64.h       25 Aug 2007 20:12:48 -0000      1.18
@@ -18,6 +18,14 @@
 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 Boston, MA 02110-1301, USA.  */
 
+#ifdef i386
+/* Although we're running on an amd64 kernel, we're actually compiling for
+   the x86 architecture.  The user should probably have provided an
+   explicit --build to `configure', but if everything else than the kernel
+   is running in i386 mode, then the bug is really ours: we should have
+   guessed better.  */
+#include "m/intel386.h"
+#else
 
 /* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
@@ -156,6 +164,7 @@
 #endif
 
 #endif /* __FreeBSD__ */
+#endif /* !i386 */
 
 /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
    (do not change this comment) */