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 /x86_64 | |
| 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 'x86_64')
| -rw-r--r-- | x86_64/configfrag.ac | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/x86_64/configfrag.ac b/x86_64/configfrag.ac index 480028c8..817eff3d 100644 --- a/x86_64/configfrag.ac +++ b/x86_64/configfrag.ac @@ -28,7 +28,9 @@ dnl USE OF THIS SOFTWARE. AC_DEFINE([CPU_L1_SHIFT], [6], [CPU_L1_SHIFT]) [# Does the architecture provide machine-specific interfaces? - mach_machine_routines=1;; + mach_machine_routines=1 + + enable_pae=yes;; *)] AM_CONDITIONAL([HOST_x86_64], [false])[;; esac @@ -40,8 +42,6 @@ case $host_platform in AM_CONDITIONAL([PLATFORM_at], [false])[;; esac] -ncom=0 -nlpr=0 [case $host_platform:$host_cpu in at:x86_64)] ncom=4 @@ -52,15 +52,6 @@ nlpr=0 *) :;; esac] - -# i386/bogus/com.h -AC_DEFINE_UNQUOTED([NCOM], [$ncom], [NCOM]) - -# i386/bogus/lpr.h -AC_DEFINE_UNQUOTED([NLPR], [$nlpr], [NLPR]) - -AC_DEFINE([PAE], [1], [PAE support]) -AM_CONDITIONAL([enable_pae], [true]) dnl Local Variables: dnl mode: autoconf |