diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 20:52:36 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 20:52:36 +0100 |
| commit | 534fe660fc8910ff77920ba12d5fcb66825b83e7 (patch) | |
| tree | 0f3d894d8c4c181fb420953a89e8e07d11f5451a | |
| parent | d7dcc044cd586dc5ffaadb7b59355596222e16b3 (diff) | |
Enable at x86_64 build
* x86_64/configfrag.ac (ncom, nplr) [!at:x86_64]: Set to 0.
(ncom) [at:x86_64]: Set to 4.
(nlpr) [at:x86_64]: Set to 1.
(ATX86_64): Define to 1.
(NCOM): Define.
(NLPR): Define.
* configure.ac [at:x86_64]: Accept combination.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | x86_64/configfrag.ac | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 42dfcd40..49e16399 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ case $host_platform:$host_cpu in default:x86_64)] AC_MSG_WARN([Platform set to Xen by default, this can not boot on non-Xen systems, you currently need a 32bit build for that.]) [host_platform=xen;; - at:i?86 | xen:i?86 | xen:x86_64) + at:i?86 | xen:i?86 | at:x86_64 | xen:x86_64) :;; *)] AC_MSG_ERROR([unsupported combination of cpu type `$host_cpu' and platform diff --git a/x86_64/configfrag.ac b/x86_64/configfrag.ac index 99db468f..480028c8 100644 --- a/x86_64/configfrag.ac +++ b/x86_64/configfrag.ac @@ -39,6 +39,25 @@ 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 + nlpr=1 + AC_DEFINE([ATX86_64], [1], [ATX86_64])[;; + xen:x86_64)] + AC_DEFINE([ATX86_64], [1], [ATX86_64])[;; + *) + :;; +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]) |