diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-04-27 23:43:38 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-04-27 23:43:38 -0700 |
| commit | 44e3d510df92cc32bc682a874b978608075ffad2 (patch) | |
| tree | ceaed40c2bab4527d78dcd1554fe0bdd2865bca0 /src/m/amdx86-64.h | |
| parent | 17818d715235dafd82625fb6d739dddaf60c2701 (diff) | |
| download | emacs-44e3d510df92cc32bc682a874b978608075ffad2.tar.gz | |
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.
Diffstat (limited to 'src/m/amdx86-64.h')
| -rw-r--r-- | src/m/amdx86-64.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index f7dfb126e6e..b2e6cae48c7 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -17,15 +17,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -#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. USUAL-OPSYS="linux" */ @@ -90,7 +81,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define LIB_STANDARD -lgcc -lc -lgcc $(CRT_DIR)/crtn.o #endif /* SOLARIS2 */ -#endif /* !i386 */ /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e (do not change this comment) */ |