From owner-svn-src-all@FreeBSD.ORG Tue Jan 19 15:31:18 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DCE21065679; Tue, 19 Jan 2010 15:31:18 +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 634AA8FC15; Tue, 19 Jan 2010 15:31:18 +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 o0JFVIRp029722; Tue, 19 Jan 2010 15:31:18 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0JFVI6n029716; Tue, 19 Jan 2010 15:31:18 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201001191531.o0JFVI6n029716@svn.freebsd.org> From: Ed Schouten Date: Tue, 19 Jan 2010 15:31:18 +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: r202628 - in head: . sys/amd64/amd64 sys/i386/i386 sys/i386/xen sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2010 15:31:18 -0000 Author: ed Date: Tue Jan 19 15:31:18 2010 New Revision: 202628 URL: http://svn.freebsd.org/changeset/base/202628 Log: 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. Modified: head/Makefile 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/Makefile ============================================================================== --- head/Makefile Tue Jan 19 14:45:58 2010 (r202627) +++ head/Makefile Tue Jan 19 15:31:18 2010 (r202628) @@ -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," \ Modified: head/sys/amd64/amd64/pmap.c ============================================================================== --- head/sys/amd64/amd64/pmap.c Tue Jan 19 14:45:58 2010 (r202627) +++ head/sys/amd64/amd64/pmap.c Tue Jan 19 15:31:18 2010 (r202628) @@ -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 Modified: head/sys/i386/i386/pmap.c ============================================================================== --- head/sys/i386/i386/pmap.c Tue Jan 19 14:45:58 2010 (r202627) +++ head/sys/i386/i386/pmap.c Tue Jan 19 15:31:18 2010 (r202628) @@ -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 Modified: head/sys/i386/xen/pmap.c ============================================================================== --- head/sys/i386/xen/pmap.c Tue Jan 19 14:45:58 2010 (r202627) +++ head/sys/i386/xen/pmap.c Tue Jan 19 15:31:18 2010 (r202628) @@ -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 Modified: head/sys/sys/cdefs.h ============================================================================== --- head/sys/sys/cdefs.h Tue Jan 19 14:45:58 2010 (r202627) +++ head/sys/sys/cdefs.h Tue Jan 19 15:31:18 2010 (r202628) @@ -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