From 703706d7e41b7efec91aa6c5204fd864aa845f5f Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@apple.com>
Date: Tue, 12 Sep 2006 06:09:05 +0000
Subject: [PATCH] config.gcc (i[34567]86-*-darwin*): Set with_arch and with_cpu
 by default.

	* config.gcc (i[34567]86-*-darwin*): Set with_arch and
	with_cpu by default.

From-SVN: r116874
---
 gcc/ChangeLog  | 3 +++
 gcc/config.gcc | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b937ee587a1..edd15d9b7ba 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-11  Geoffrey Keating  <geoffk@apple.com>
 
+	* config.gcc (i[34567]86-*-darwin*): Set with_arch and
+	with_cpu by default.
+
 	* dwarf2out.c (dwarf_file_data): New.
 	(enum dw_val_class): Add dw_val_class_file.
 	(struct dw_val_struct): Add val_file.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index efa6c8d867d..6068a28f8a8 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1002,6 +1002,13 @@ hppa[12]*-*-hpux11*)
 	;;
 i[34567]86-*-darwin*)
 	need_64bit_hwint=yes
+
+	# This is so that '.../configure && make' doesn't fail due to
+	# config.guess deciding that the configuration is i386-*-darwin* and
+	# then this file using that to set --with-cpu=i386 which has no -m64
+	# support.
+	with_arch=${with_arch:-nocona}
+	with_cpu=${with_cpu:-generic}
 	;;
 i[34567]86-*-elf*)
 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h i386/i386elf.h"