summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--i386/configfrag.ac15
2 files changed, 16 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e5e3932..9e160b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-12 Thomas Schwinge <tschwinge@gnu.org>
+
+ * i386/configfrag.ac (enable_pae): Add checks: this is ix86-only.
+
2008-11-11 Shakthi Kannan <shakshurd@gmail.com>
* kern/eventcount.c (evc_wait_clear): Remove unused variable 'ret'.
diff --git a/i386/configfrag.ac b/i386/configfrag.ac
index 19112a0..f95aa86 100644
--- a/i386/configfrag.ac
+++ b/i386/configfrag.ac
@@ -1,6 +1,6 @@
dnl Configure fragment for i386.
-dnl Copyright (C) 1999, 2004, 2006, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 1999, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
dnl Permission to use, copy, modify and distribute this software and its
dnl documentation is hereby granted, provided that both the copyright
@@ -105,8 +105,17 @@ if [ x"$enable_lpr" = xyes ]; then]
AC_ARG_ENABLE([pae],
- AS_HELP_STRING([--enable-pae], [enable PAE support]))
-[if [ x"$enable_pae" = xyes ]; then]
+ AS_HELP_STRING([--enable-pae], [PAE feature (ix86-only); disabled by
+ default]))
+[case $host_platform:$host_cpu in
+ *:i?86)
+ :;;
+ *)
+ 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]