From owner-svn-src-head@FreeBSD.ORG  Sat Jan  9 17:21:36 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA17A1065670;
	Sat,  9 Jan 2010 17:21:36 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 996928FC1C;
	Sat,  9 Jan 2010 17:21:36 +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 o09HLatT064950;
	Sat, 9 Jan 2010 17:21:36 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o09HLaw9064948;
	Sat, 9 Jan 2010 17:21:36 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201001091721.o09HLaw9064948@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 9 Jan 2010 17:21:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201903 - head/sys/conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Jan 2010 17:21:36 -0000

Author: imp
Date: Sat Jan  9 17:21:36 2010
New Revision: 201903
URL: http://svn.freebsd.org/changeset/base/201903

Log:
  Merge r201902 and r195669 from projects/mips into head by hand:
  
  r201902 | imp | 2010-01-09 10:16:19 -0700 (Sat, 09 Jan 2010) | 2 lines
  Fix comment, which was missed in an earlier commit...
  
  r195669 | gonzo | 2009-07-13 17:03:44 -0600 (Mon, 13 Jul 2009) | 3 lines
  - Remove -mno-dsp from CFLAGS. MIPS DSP ASE is off by default
     now (as it should be)

Modified:
  head/sys/conf/kern.mk

Modified: head/sys/conf/kern.mk
==============================================================================
--- head/sys/conf/kern.mk	Sat Jan  9 17:16:19 2010	(r201902)
+++ head/sys/conf/kern.mk	Sat Jan  9 17:21:36 2010	(r201903)
@@ -86,11 +86,10 @@ INLINE_LIMIT?=	15000
 .endif
 
 #
-# For MIPS we also tell gcc to use floating point emulation and 
-# disable MIPS DSP ASE Instruction set.
+# For MIPS we also tell gcc to use floating point emulation
 #
 .if ${MACHINE_ARCH} == "mips"
-CFLAGS+=	-msoft-float -mno-dsp
+CFLAGS+=	-msoft-float
 INLINE_LIMIT?=	8000
 .endif