From 7c1993fc4ca4b87bbbe4c25d9adffbd8a9d61473 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Thu, 2 Jan 2003 14:51:37 +0000
Subject: [PATCH] 2003-01-02  Yoshinori K. Okuji  <okuji@enbug.org>

	From Jeremy Katz:
	* configure.in: Support building on x86_64 with gcc -m32.
---
 ChangeLog             | 5 +++++
 configure             | 7 ++++++-
 configure.in          | 7 ++++++-
 docs/grub-install.8   | 2 +-
 docs/grub-md5-crypt.8 | 2 +-
 docs/grub-terminfo.8  | 2 +-
 docs/grub.8           | 2 +-
 docs/mbchk.1          | 2 +-
 8 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 14e71db90..7e83dd8d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-02  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	From Jeremy Katz:
+	* configure.in: Support building on x86_64 with gcc -m32.
+
 2003-01-02  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	From Jeremy Katz:
diff --git a/configure b/configure
index afdb8cace..53b59cd8f 100644
--- a/configure
+++ b/configure
@@ -1665,6 +1665,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 case "$host_cpu" in
 i[3456]86) host_cpu=i386 ;;
+x86_64) host_cpu=x86_64 ;;
 *) { { echo "$as_me:$LINENO: error: unsupported CPU type" >&5
 echo "$as_me: error: unsupported CPU type" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -1752,6 +1753,10 @@ if test "x$CFLAGS" = x; then
   default_CFLAGS=yes
 fi
 
+if test "x$host_cpu" = xx86_64; then
+  CFLAGS="-m32 $CFLAGS"
+fi
+
 #
 # Programs
 #
@@ -2912,7 +2917,7 @@ fi
 # optimization flags
 if test "x$ac_cv_c_compiler_gnu" = xyes; then
   if test "x$default_CFLAGS" = xyes; then
-    CFLAGS="-g"
+    CFLAGS="$CFLAGS -g"
     # If the user specify the directory for binutils, add the option `-B'.
     if test "x$with_binutils" != x; then
       CFLAGS="-B$with_binutils/ $CFLAGS"
diff --git a/configure.in b/configure.in
index aa79d9b94..83d1634eb 100644
--- a/configure.in
+++ b/configure.in
@@ -21,6 +21,7 @@ AC_CANONICAL_HOST
 
 case "$host_cpu" in
 i[[3456]]86) host_cpu=i386 ;;
+x86_64) host_cpu=x86_64 ;;
 *) AC_MSG_ERROR([unsupported CPU type]) ;;
 esac
 
@@ -44,6 +45,10 @@ if test "x$CFLAGS" = x; then
   default_CFLAGS=yes
 fi
 
+if test "x$host_cpu" = xx86_64; then
+  CFLAGS="-m32 $CFLAGS"
+fi
+
 #
 # Programs
 #
@@ -72,7 +77,7 @@ fi
 # optimization flags
 if test "x$ac_cv_prog_gcc" = xyes; then
   if test "x$default_CFLAGS" = xyes; then
-    CFLAGS="-g"
+    CFLAGS="$CFLAGS -g"
     # If the user specify the directory for binutils, add the option `-B'.
     if test "x$with_binutils" != x; then
       CFLAGS="-B$with_binutils/ $CFLAGS"
diff --git a/docs/grub-install.8 b/docs/grub-install.8
index db1ed8292..c2c24b397 100644
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "December 2002" "grub-install (GNU GRUB 0.93)" FSF
+.TH GRUB-INSTALL "8" "January 2003" "grub-install (GNU GRUB 0.93)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8
index ea979e9c2..6bfc17bd1 100644
--- a/docs/grub-md5-crypt.8
+++ b/docs/grub-md5-crypt.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-MD5-CRYPT "8" "December 2002" "grub-md5-crypt (GNU GRUB )" FSF
+.TH GRUB-MD5-CRYPT "8" "January 2003" "grub-md5-crypt (GNU GRUB )" FSF
 .SH NAME
 grub-md5-crypt \- Encrypt a password in MD5 format
 .SH SYNOPSIS
diff --git a/docs/grub-terminfo.8 b/docs/grub-terminfo.8
index 5fd026fa5..5c8fef3fe 100644
--- a/docs/grub-terminfo.8
+++ b/docs/grub-terminfo.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-TERMINFO "8" "December 2002" "grub-terminfo (GNU GRUB 0.93)" FSF
+.TH GRUB-TERMINFO "8" "January 2003" "grub-terminfo (GNU GRUB 0.93)" FSF
 .SH NAME
 grub-terminfo \- Generate a terminfo command from a terminfo name
 .SH SYNOPSIS
diff --git a/docs/grub.8 b/docs/grub.8
index 0e1cbd96b..f601c90e8 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "December 2002" "grub (GNU GRUB 0.93)" FSF
+.TH GRUB "8" "January 2003" "grub (GNU GRUB 0.93)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/mbchk.1 b/docs/mbchk.1
index a1e90161d..0c921a1ec 100644
--- a/docs/mbchk.1
+++ b/docs/mbchk.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH MBCHK "1" "December 2002" "mbchk (GNU GRUB 0.93)" FSF
+.TH MBCHK "1" "January 2003" "mbchk (GNU GRUB 0.93)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS