diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-29 16:07:01 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-29 16:58:00 +0200 |
| commit | 15955354d26cda32bfb88eb150d5661fe66dc9d0 (patch) | |
| tree | 664c4df3c90c0f9c9755ea9bf1d9a0515d7a8417 /i386/configfrag.ac | |
| parent | d99288c94ddfade228ce74e734ced699cda567db (diff) | |
| download | gnumach-15955354d26cda32bfb88eb150d5661fe66dc9d0.tar.gz gnumach-15955354d26cda32bfb88eb150d5661fe66dc9d0.tar.bz2 gnumach-15955354d26cda32bfb88eb150d5661fe66dc9d0.zip | |
Share ncom, lpr, PAE definitions between i386 and x86_64
Otherwise the x86_64 configfrag would overwrite i386's.
* i386/configfrag.ac: Remove ncom, nlpr, pae, NCOM, NLPR, PAE
definitions.
* i386/configfrag.ac: Remove ncom, nlpr, NCOM, NLPR, PAE
definitions. Enable PAE.
* configfrag-first.ac: New file, defines ncom, nlpr, pae.
* configure.ac: Include configfrag-first.ac
* configfrag.ac: Define NCOM, NLPR, PAE.
Diffstat (limited to 'i386/configfrag.ac')
| -rw-r--r-- | i386/configfrag.ac | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/i386/configfrag.ac b/i386/configfrag.ac index 3c29bdf9..df5311e5 100644 --- a/i386/configfrag.ac +++ b/i386/configfrag.ac @@ -44,8 +44,6 @@ esac # Formerly in `i386/bogus/'. # -ncom=0 -nlpr=0 case $host_platform:$host_cpu in at:i?86) ncom=4 @@ -62,12 +60,6 @@ case $host_platform:$host_cpu in *) :;; esac] - -# i386/bogus/com.h -AC_DEFINE_UNQUOTED([NCOM], [$ncom], [NCOM]) - -# i386/bogus/lpr.h -AC_DEFINE_UNQUOTED([NLPR], [$nlpr], [NLPR]) # # Options. @@ -100,9 +92,6 @@ if [ x"$enable_lpr" = xyes ]; then] [fi] -AC_ARG_ENABLE([pae], - AS_HELP_STRING([--enable-pae], [PAE support (ix86-only); on ix86-at disabled - by default, on ix86-xen enabled by default])) [case $host_platform:$host_cpu in xen:i?86) enable_pae=${enable_pae-yes};; @@ -112,13 +101,7 @@ AC_ARG_ENABLE([pae], if [ x"$enable_pae" = xyes ]; then] AC_MSG_ERROR([can only enable the `PAE' feature on ix86.]) [fi;; -esac -if [ x"$enable_pae" = xyes ]; then] - AC_DEFINE([PAE], [1], [PAE support]) - AM_CONDITIONAL([enable_pae], [true]) -[else] - AM_CONDITIONAL([enable_pae], [false]) -[fi] +esac] AC_ARG_WITH([_START_MAP], AS_HELP_STRING([--with-_START_MAP=0x1000000], [specify kernel mapping start address]), |