Mercurial > emacs
changeset 82846:6aa3ccf8fedc
Redirect to intel386.h if compiling for i386.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 25 Aug 2007 20:12:48 +0000 |
| parents | 652a69b79238 |
| children | a22a8a63b26d |
| files | src/ChangeLog src/m/amdx86-64.h |
| diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Aug 25 20:11:09 2007 +0000 +++ b/src/ChangeLog Sat Aug 25 20:12:48 2007 +0000 @@ -1,5 +1,7 @@ 2007-08-25 Stefan Monnier <monnier@iro.umontreal.ca> + * m/amdx86-64.h: Redirect to intel386.h if compiling for i386. + * xdisp.c (Finvisible_p): New function. (syms_of_xdisp): defsubr it.
--- a/src/m/amdx86-64.h Sat Aug 25 20:11:09 2007 +0000 +++ b/src/m/amdx86-64.h Sat Aug 25 20:12:48 2007 +0000 @@ -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) */