Mercurial > emacs
comparison src/m/amdx86-64.h @ 108145:947dd776616f
Move test for 64-bit kernel with 32-bit userland to configure.
See discussion in bug#5655.
* configure.in (machine, canonical): On amdx86-64, check for a 32-bit
userland and maybe change values to i386 (move test from s/amdx86-64.h).
* src/m/amdx86-64.h [i386]: Move this test to configure.in.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 27 Apr 2010 23:43:38 -0700 |
parents | 13415f222ad9 |
children | 000b400531eb |
comparison
equal
deleted
inserted
replaced
108144:c46b2d0614cb | 108145:947dd776616f |
---|---|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 GNU General Public License for more details. | 15 GNU General Public License for more details. |
16 | 16 |
17 You should have received a copy of the GNU General Public License | 17 You should have received a copy of the GNU General Public License |
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
19 | |
20 #ifdef i386 | |
21 /* Although we're running on an amd64 kernel, we're actually compiling for | |
22 the x86 architecture. The user should probably have provided an | |
23 explicit --build to `configure', but if everything else than the kernel | |
24 is running in i386 mode, then the bug is really ours: we should have | |
25 guessed better. */ | |
26 #include "m/intel386.h" | |
27 #else | |
28 | 19 |
29 /* The following line tells the configuration script what sort of | 20 /* The following line tells the configuration script what sort of |
30 operating system this machine is likely to run. | 21 operating system this machine is likely to run. |
31 USUAL-OPSYS="linux" */ | 22 USUAL-OPSYS="linux" */ |
32 | 23 |
88 or else we risk getting unresolved externals. */ | 79 or else we risk getting unresolved externals. */ |
89 #undef LIB_STANDARD | 80 #undef LIB_STANDARD |
90 #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o | 81 #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o |
91 | 82 |
92 #endif /* SOLARIS2 */ | 83 #endif /* SOLARIS2 */ |
93 #endif /* !i386 */ | |
94 | 84 |
95 /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e | 85 /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e |
96 (do not change this comment) */ | 86 (do not change this comment) */ |