From owner-svn-src-head@FreeBSD.ORG  Wed May  9 07:55:43 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7AE64106566B;
	Wed,  9 May 2012 07:55:43 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C0A48FC15;
	Wed,  9 May 2012 07:55:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q497thUi072012;
	Wed, 9 May 2012 07:55:43 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q497thLH072008;
	Wed, 9 May 2012 07:55:43 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201205090755.q497thLH072008@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 9 May 2012 07:55: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: r235153 - in head/sys/boot: common i386/efi
	sparc64/loader
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: Wed, 09 May 2012 07:55:43 -0000

Author: avg
Date: Wed May  9 07:55:42 2012
New Revision: 235153
URL: http://svn.freebsd.org/changeset/base/235153

Log:
  sys/boot: add common CTASSERT definition

Modified:
  head/sys/boot/common/bootstrap.h
  head/sys/boot/i386/efi/reloc.c
  head/sys/boot/sparc64/loader/main.c

Modified: head/sys/boot/common/bootstrap.h
==============================================================================
--- head/sys/boot/common/bootstrap.h	Wed May  9 04:54:50 2012	(r235152)
+++ head/sys/boot/common/bootstrap.h	Wed May  9 07:55:42 2012	(r235153)
@@ -327,4 +327,10 @@ void	dev_cleanup(void);
 
 time_t	time(time_t *tloc);
 
+#ifndef CTASSERT                /* Allow lint to override */
+#define CTASSERT(x)             _CTASSERT(x, __LINE__)
+#define _CTASSERT(x, y)         __CTASSERT(x, y)
+#define __CTASSERT(x, y)        typedef char __assert ## y[(x) ? 1 : -1]
+#endif
+
 #endif /* !_BOOTSTRAP_H_ */

Modified: head/sys/boot/i386/efi/reloc.c
==============================================================================
--- head/sys/boot/i386/efi/reloc.c	Wed May  9 04:54:50 2012	(r235152)
+++ head/sys/boot/i386/efi/reloc.c	Wed May  9 07:55:42 2012	(r235153)
@@ -30,16 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/elf32.h>
 #include <efi.h>
-
-/*
- * XXX: we can't include sys/systm.h.
- */
-#ifndef CTASSERT                /* Allow lint to override */
-#define CTASSERT(x)             _CTASSERT(x, __LINE__)
-#define _CTASSERT(x, y)         __CTASSERT(x, y)
-#define __CTASSERT(x, y)        typedef char __assert ## y[(x) ? 1 : -1]
-#endif
-
+#include <bootstrap.h>
 
 /*
  * A simple relocator for IA32 EFI binaries.

Modified: head/sys/boot/sparc64/loader/main.c
==============================================================================
--- head/sys/boot/sparc64/loader/main.c	Wed May  9 04:54:50 2012	(r235152)
+++ head/sys/boot/sparc64/loader/main.c	Wed May  9 07:55:42 2012	(r235153)
@@ -74,12 +74,6 @@ __FBSDID("$FreeBSD$");
 #include "libofw.h"
 #include "dev_net.h"
 
-#ifndef CTASSERT
-#define	CTASSERT(x)		_CTASSERT(x, __LINE__)
-#define	_CTASSERT(x, y)		__CTASSERT(x, y)
-#define	__CTASSERT(x, y)	typedef char __assert ## y[(x) ? 1 : -1]
-#endif
-
 extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
 
 enum {