From d7e2a28f59f4475f927b8ee553684949f1d5d34b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 25 Aug 2007 20:12:48 +0000 Subject: [PATCH] Redirect to intel386.h if compiling for i386. --- src/ChangeLog | 2 ++ src/m/amdx86-64.h | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index b775844bf3b..ee9eac3172c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2007-08-25 Stefan Monnier + * m/amdx86-64.h: Redirect to intel386.h if compiling for i386. + * xdisp.c (Finvisible_p): New function. (syms_of_xdisp): defsubr it. diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 681be8b0647..1f759cc9ec6 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -18,6 +18,14 @@ along with GNU Emacs; see the file COPYING. If not, write to 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 @@ Boston, MA 02110-1301, USA. */ #endif #endif /* __FreeBSD__ */ +#endif /* !i386 */ /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e (do not change this comment) */ -- 2.39.2