summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--sys/amd64/amd64/pmap.c2
-rw-r--r--sys/i386/i386/pmap.c2
-rw-r--r--sys/i386/xen/pmap.c2
-rw-r--r--sys/sys/cdefs.h6
5 files changed, 4 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index bd26716..10e227c 100644
--- a/Makefile
+++ b/Makefile
@@ -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
OpenPOWER on IntegriCloud