From 15955354d26cda32bfb88eb150d5661fe66dc9d0 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 29 Mar 2020 16:07:01 +0200
Subject: 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.
---
 x86_64/configfrag.ac | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'x86_64')

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
-- 
cgit v1.2.3