Make genassym compile - the recent buf locking changes meant that more

things from #ifdef KERNEL were needed.
This commit is contained in:
Peter Wemm 1999-06-26 12:45:17 +00:00
parent 240ee5d0e0
commit 9cccca53d8
4 changed files with 10 additions and 24 deletions

View File

@ -34,10 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
* $Id: genassym.c,v 1.4 1998/11/15 18:25:15 dfr Exp $
* $Id: genassym.c,v 1.5 1999/02/28 10:53:28 bde Exp $
*/
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/errno.h>
#include <sys/proc.h>
@ -52,9 +53,7 @@
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
#define KERNEL /* XXX avoid user headers */
#include <sys/user.h>
#undef KERNEL
#include <net/if.h>
#include <netinet/in.h>
#include <nfs/nfsv2.h>
@ -70,12 +69,6 @@ int printf __P((const char *, ...));
#define P(name, val) \
printf(BIG(val) ? "#define\t%s 0x%qx\n" : "#define\t%s %qd\n", name, val)
/* XXX Danger Will Robinson */
struct prochd {
struct proc *ph_link; /* Linked list of running processes. */
struct proc *ph_rlink;
};
#define OFF(name, type, elem) P(#name, (long long) &((type*)0)->elem)
#define CONST2(name, val) P(#name, (long long) val)
#define CONST1(name) P(#name, (long long) name)

View File

@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
# $Id: Makefile.alpha,v 1.24 1999/05/08 20:04:38 peter Exp $
# $Id: Makefile.alpha,v 1.25 1999/05/10 03:02:22 peter Exp $
#
# Makefile for FreeBSD
#
@ -179,7 +179,7 @@ assym.s: genassym
# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${ALPHA}/alpha/genassym.c Makefile opt_global.h
${HCC} -c ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
${HCC} -c ${COPTS} ${PARAM} ${ALPHA}/alpha/genassym.c
genassym: genassym.o
${HCC} -static ${COPTS} ${PARAM} genassym.o -o $@
@ -236,7 +236,7 @@ ${OBJS}: opt_global.h
depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
rm -f .newdep
mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
mkdep -a -f .newdep ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
mkdep -a -f .newdep ${COPTS} ${PARAM} ${ALPHA}/alpha/genassym.c
MKDEP_CPP="${CC} -E -x assembler-with-cpp" ; export MKDEP_CPP ; \
mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
rm -f .depend

View File

@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
# $Id: Makefile.alpha,v 1.24 1999/05/08 20:04:38 peter Exp $
# $Id: Makefile.alpha,v 1.25 1999/05/10 03:02:22 peter Exp $
#
# Makefile for FreeBSD
#
@ -179,7 +179,7 @@ assym.s: genassym
# Some of the defines that genassym outputs may well depend on the
# value of kernel options.
genassym.o: ${ALPHA}/alpha/genassym.c Makefile opt_global.h
${HCC} -c ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
${HCC} -c ${COPTS} ${PARAM} ${ALPHA}/alpha/genassym.c
genassym: genassym.o
${HCC} -static ${COPTS} ${PARAM} genassym.o -o $@
@ -236,7 +236,7 @@ ${OBJS}: opt_global.h
depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND}
rm -f .newdep
mkdep -a -f .newdep ${COPTS} ${CFILES} ${SYSTEM_CFILES}
mkdep -a -f .newdep ${COPTS} ${PARAM} -UKERNEL ${ALPHA}/alpha/genassym.c
mkdep -a -f .newdep ${COPTS} ${PARAM} ${ALPHA}/alpha/genassym.c
MKDEP_CPP="${CC} -E -x assembler-with-cpp" ; export MKDEP_CPP ; \
mkdep -a -f .newdep -DLOCORE ${COPTS} ${SFILES} ${SYSTEM_SFILES}
rm -f .depend

View File

@ -34,10 +34,11 @@
* SUCH DAMAGE.
*
* from: @(#)genassym.c 5.11 (Berkeley) 5/10/91
* $Id: genassym.c,v 1.4 1998/11/15 18:25:15 dfr Exp $
* $Id: genassym.c,v 1.5 1999/02/28 10:53:28 bde Exp $
*/
#include <sys/param.h>
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/errno.h>
#include <sys/proc.h>
@ -52,9 +53,7 @@
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <vm/vm_map.h>
#define KERNEL /* XXX avoid user headers */
#include <sys/user.h>
#undef KERNEL
#include <net/if.h>
#include <netinet/in.h>
#include <nfs/nfsv2.h>
@ -70,12 +69,6 @@ int printf __P((const char *, ...));
#define P(name, val) \
printf(BIG(val) ? "#define\t%s 0x%qx\n" : "#define\t%s %qd\n", name, val)
/* XXX Danger Will Robinson */
struct prochd {
struct proc *ph_link; /* Linked list of running processes. */
struct proc *ph_rlink;
};
#define OFF(name, type, elem) P(#name, (long long) &((type*)0)->elem)
#define CONST2(name, val) P(#name, (long long) val)
#define CONST1(name) P(#name, (long long) name)