svn commit: r193734 - in head: lib/libusb sys/amd64/amd64 sys/i386/i386 sys/i386/xen sys/sys

[Ed Schouten]

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