svn commit: r237752 - in stable/9/sys/boot: common i386/efi sparc64/loader

[Andriy Gapon]

Author: avg
Date: Fri Jun 29 09:17:49 2012
New Revision: 237752
URL: http://svn.freebsd.org/changeset/base/237752

Log:
  MFC r235153: sys/boot: add common CTASSERT definition

Modified:
  stable/9/sys/boot/common/bootstrap.h
  stable/9/sys/boot/i386/efi/reloc.c
  stable/9/sys/boot/sparc64/loader/main.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/isp/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/boot/common/bootstrap.h
==============================================================================
--- stable/9/sys/boot/common/bootstrap.h	Fri Jun 29 09:03:47 2012	(r237751)
+++ stable/9/sys/boot/common/bootstrap.h	Fri Jun 29 09:17:49 2012	(r237752)
@@ -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: stable/9/sys/boot/i386/efi/reloc.c
==============================================================================
--- stable/9/sys/boot/i386/efi/reloc.c	Fri Jun 29 09:03:47 2012	(r237751)
+++ stable/9/sys/boot/i386/efi/reloc.c	Fri Jun 29 09:17:49 2012	(r237752)
@@ -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: stable/9/sys/boot/sparc64/loader/main.c
==============================================================================
--- stable/9/sys/boot/sparc64/loader/main.c	Fri Jun 29 09:03:47 2012	(r237751)
+++ stable/9/sys/boot/sparc64/loader/main.c	Fri Jun 29 09:17:49 2012	(r237752)
@@ -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 {