From owner-svn-src-head@FreeBSD.ORG  Mon Jun  8 18:23:43 2009
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 B874F106566B;
	Mon,  8 Jun 2009 18:23:43 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B9538FC13;
	Mon,  8 Jun 2009 18:23:43 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58INh0O038129;
	Mon, 8 Jun 2009 18:23:43 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58INhX8038125;
	Mon, 8 Jun 2009 18:23:43 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200906081823.n58INhX8038125@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Mon, 8 Jun 2009 18:23:43 +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: r193734 - in head: lib/libusb sys/amd64/amd64
	sys/i386/i386 sys/i386/xen sys/sys
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: Mon, 08 Jun 2009 18:23:44 -0000

Author: ed
Date: Mon Jun  8 18:23:43 2009
New Revision: 193734
URL: http://svn.freebsd.org/changeset/base/193734

Log:
  Revert my change; reintroduce __gnu89_inline.
  
  It turns out our compiler in stable/7 can't build this code anymore.
  Even though my opinion is that those people should just run `make
  kernel-toolchain' before building a kernel, I am willing to wait and
  commit this after we've branched stable/8.
  
  Requested by:	rwatson

Modified:
  head/lib/libusb/libusb.3   (props changed)
  head/sys/amd64/amd64/pmap.c
  head/sys/i386/i386/pmap.c
  head/sys/i386/xen/pmap.c
  head/sys/sys/cdefs.h

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Mon Jun  8 18:09:51 2009	(r193733)
+++ head/sys/amd64/amd64/pmap.c	Mon Jun  8 18:23:43 2009	(r193734)
@@ -153,7 +153,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #if !defined(DIAGNOSTIC)
-#define PMAP_INLINE	extern inline
+#define PMAP_INLINE	__gnu89_inline
 #else
 #define PMAP_INLINE
 #endif

Modified: head/sys/i386/i386/pmap.c
==============================================================================
--- head/sys/i386/i386/pmap.c	Mon Jun  8 18:09:51 2009	(r193733)
+++ head/sys/i386/i386/pmap.c	Mon Jun  8 18:23:43 2009	(r193734)
@@ -161,7 +161,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #if !defined(DIAGNOSTIC)
-#define PMAP_INLINE	extern inline
+#define PMAP_INLINE	__gnu89_inline
 #else
 #define PMAP_INLINE
 #endif

Modified: head/sys/i386/xen/pmap.c
==============================================================================
--- head/sys/i386/xen/pmap.c	Mon Jun  8 18:09:51 2009	(r193733)
+++ head/sys/i386/xen/pmap.c	Mon Jun  8 18:23:43 2009	(r193734)
@@ -172,7 +172,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #if !defined(PMAP_DIAGNOSTIC)
-#define PMAP_INLINE	extern inline
+#define PMAP_INLINE	__gnu89_inline
 #else
 #define PMAP_INLINE
 #endif

Modified: head/sys/sys/cdefs.h
==============================================================================
--- head/sys/sys/cdefs.h	Mon Jun  8 18:09:51 2009	(r193733)
+++ head/sys/sys/cdefs.h	Mon Jun  8 18:23:43 2009	(r193734)
@@ -234,6 +234,12 @@
 #define	__always_inline
 #endif
 
+#if __GNUC_PREREQ__(4, 2) /* actually 4.1.3 */
+#define	__gnu89_inline	__attribute__((__gnu_inline__)) __inline
+#else
+#define	__gnu89_inline
+#endif
+
 #if __GNUC_PREREQ__(3, 1)
 #define	__noinline	__attribute__ ((__noinline__))
 #else