From owner-svn-src-stable-7@FreeBSD.ORG  Wed Jan 20 15:14:20 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D2188106568B;
	Wed, 20 Jan 2010 15:14:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C0F688FC15;
	Wed, 20 Jan 2010 15:14:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0KFEKso038902;
	Wed, 20 Jan 2010 15:14:20 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0KFEKWP038900;
	Wed, 20 Jan 2010 15:14:20 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201001201514.o0KFEKWP038900@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 20 Jan 2010 15:14:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202703 - stable/7/contrib/gcc/config/i386
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Jan 2010 15:14:20 -0000

Author: jhb
Date: Wed Jan 20 15:14:20 2010
New Revision: 202703
URL: http://svn.freebsd.org/changeset/base/202703

Log:
  MFC 198344:
  Change gcc to assume a default machine architecture of 486 instead of 386
  on "i386".  Doing it in the compiler is deemed to be less fragile then
  attempting to provide a default -march setting via bsd.cpu.mk.  FreeBSD
  itself has not supported plain 386 CPUs since 5.x.

Modified:
  stable/7/contrib/gcc/config/i386/i386.c
Directory Properties:
  stable/7/contrib/gcc/   (props changed)

Modified: stable/7/contrib/gcc/config/i386/i386.c
==============================================================================
--- stable/7/contrib/gcc/config/i386/i386.c	Wed Jan 20 15:13:38 2010	(r202702)
+++ stable/7/contrib/gcc/config/i386/i386.c	Wed Jan 20 15:14:20 2010	(r202703)
@@ -1614,7 +1614,7 @@ override_options (void)
 	     "-mtune=generic instead as appropriate.");
 
   if (!ix86_arch_string)
-    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386";
+    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486";
   if (!strcmp (ix86_arch_string, "generic"))
     error ("generic CPU can be used only for -mtune= switch");
   if (!strncmp (ix86_arch_string, "generic", 7))