diff options
| author | ed <ed@FreeBSD.org> | 2010-01-19 15:31:18 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2010-01-19 15:31:18 +0000 |
| commit | ec8fd67a3e544e2acdc7174c2705dbf905708614 (patch) | |
| tree | 022e9edfe2cc0b3a4a505f5859d6d8df5a26e0f1 | |
| parent | 0e8353189095d4cba57eff5168aa9a97a1f29f47 (diff) | |
| download | FreeBSD-src-ec8fd67a3e544e2acdc7174c2705dbf905708614.zip FreeBSD-src-ec8fd67a3e544e2acdc7174c2705dbf905708614.tar.gz | |
Recommit r193732:
Remove __gnu89_inline.
Now that we use C99 almost everywhere, just use C99-style in the pmap
code. Since the pmap code is the only consumer of __gnu89_inline, remove
it from cdefs.h as well. Because the flag was only introduced 17 months
ago, I don't expect any problems.
Reviewed by: alc
It was backed out, because it prevented us from building kernels using a
7.x compiler. Now that most people use 8.x, there is nothing that holds
us back. Even if people run 7.x, they should be able to build a kernel
if they run `make kernel-toolchain' or `make buildworld' first.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/pmap.c | 2 | ||||
| -rw-r--r-- | sys/i386/xen/pmap.c | 2 | ||||
| -rw-r--r-- | sys/sys/cdefs.h | 6 |
5 files changed, 4 insertions, 10 deletions
@@ -303,7 +303,7 @@ universe_${target}: .if !defined(MAKE_JUST_KERNELS) @echo ">> ${target} started on `LC_ALL=C date`" @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ - ${MAKE} ${JFLAG} buildworld \ + ${MAKE} ${JFLAG} kernel-toolchain \ TARGET=${target} \ > _.${target}.buildworld 2>&1 || \ (echo "${target} world failed," \ diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 889a06a..15e9e25 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -153,7 +153,7 @@ __FBSDID("$FreeBSD$"); #endif #if !defined(DIAGNOSTIC) -#define PMAP_INLINE __gnu89_inline +#define PMAP_INLINE extern inline #else #define PMAP_INLINE #endif diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 993b13e..b223186 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -162,7 +162,7 @@ __FBSDID("$FreeBSD$"); #endif #if !defined(DIAGNOSTIC) -#define PMAP_INLINE __gnu89_inline +#define PMAP_INLINE extern inline #else #define PMAP_INLINE #endif diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index 8cd7f00..35f006d 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -173,7 +173,7 @@ __FBSDID("$FreeBSD$"); #endif #if !defined(PMAP_DIAGNOSTIC) -#define PMAP_INLINE __gnu89_inline +#define PMAP_INLINE extern inline #else #define PMAP_INLINE #endif diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 44bed25..5d413d3 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -234,12 +234,6 @@ #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 |
