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 /configfrag.ac | |
| parent | d99288c94ddfade228ce74e734ced699cda567db (diff) | |
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 'configfrag.ac')
| -rw-r--r-- | configfrag.ac | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/configfrag.ac b/configfrag.ac index 73c23ffb..91d737ef 100644 --- a/configfrag.ac +++ b/configfrag.ac @@ -26,6 +26,19 @@ AC_DEFINE([KERNEL], [1], [KERNEL]) # Formerly in `bogus/'. # +# i386/bogus/com.h +AC_DEFINE_UNQUOTED([NCOM], [$ncom], [NCOM]) + +# i386/bogus/lpr.h +AC_DEFINE_UNQUOTED([NLPR], [$nlpr], [NLPR]) + +[if [ x"$enable_pae" = xyes ]; then] + AC_DEFINE([PAE], [1], [PAE support]) + AM_CONDITIONAL([enable_pae], [true]) +[else] + AM_CONDITIONAL([enable_pae], [false]) +[fi] + # When set, the bootstrap task symbols are preserved by the kernel debugger. # Used in `kern/bootstrap.c'. AC_DEFINE([BOOTSTRAP_SYMBOLS], [0], [BOOTSTRAP_SYMBOLS]) |