Sync with i386

\begin{quote}
Compile genassym.c with ordinary ${CFLAGS}.  The (small) needs for
${GEN_CFLAGS} and -U_KERNEL became negative when all all the
genassym.c's were converted to be cross-built.

Makefile.*:
- Cleanups associated with the old genassym.
- Fixed deprecated spelling of ${.IMPSRC} as "$<".
\end{quote}

Submitted by: bde

4 files changed, 20 insertions, 30 deletions

diff --git a/sys/alpha/alpha/genassym.c b/sys/alpha/alpha/genassym.c
index 09cc43d..e3c5028 100644
--- a/sys/alpha/alpha/genassym.c
+++ b/sys/alpha/alpha/genassym.c
@@ -40,6 +40,7 @@
 #include <stddef.h>
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/assym.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
@@ -56,9 +57,7 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#define _KERNEL	/* Avoid userland compatability headers */
 #include <sys/user.h>
-#undef _KERNEL
 #include <net/if.h>
 #include <netinet/in.h>
 #include <nfs/nfsv2.h>
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index 9274177..150b377 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -49,9 +49,6 @@ CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
 
-# Use the default object format for genassym, etc.
-GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -U_KERNEL
-
 FMT=
 CFLAGS+=	${FMT}
 
@@ -69,10 +66,10 @@ PROF+=	-mprofiler-epilogue
 # can override the others.
 CFLAGS+=	${CONF_CFLAGS}
 
-NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
-NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
-NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
-PROFILE_C= ${CC} -c ${CFLAGS} $<
+NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
+NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
+NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${.IMPSRC}
+PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
 
 GEN_CFILES= $S/$M/$M/genassym.c
 # setdef0.c and setdef1.c are intentionally
@@ -132,9 +129,9 @@ ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
-	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
-	      ${KERNEL} ${FULLKERNEL} linterrs makelinks param.c \
-	      setdef[01].c setdefs.h symbols.exclude symbols.sort tags \
+	rm -f *.o *.so *.So *.ko *.s eddep errs genassym \
+	      ${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
+	      setdef[01].c setdefs.h tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
@@ -174,7 +171,7 @@ assym.s: genassym.o
 	genassym genassym.o >assym.s
 
 genassym.o: $S/$M/$M/genassym.c
-	${CC} -c ${GEN_CFLAGS} $S/$M/$M/genassym.c
+	${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
 
 SYSTEM_OBJS+=	__divqu.o __divq.o __divlu.o __divl.o
 SYSTEM_OBJS+=	__remqu.o __remq.o __remlu.o __reml.o
@@ -226,8 +223,7 @@ ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .newdep
-	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES}
-	mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES}
+	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES}
 	env MKDEP_CPP="${CC} -E" \
 	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 9274177..150b377 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -49,9 +49,6 @@ CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".
 ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
 
-# Use the default object format for genassym, etc.
-GEN_CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -U_KERNEL
-
 FMT=
 CFLAGS+=	${FMT}
 
@@ -69,10 +66,10 @@ PROF+=	-mprofiler-epilogue
 # can override the others.
 CFLAGS+=	${CONF_CFLAGS}
 
-NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} $<
-NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} $<
-NORMAL_S= ${CC} -c ${ASM_CFLAGS} $<
-PROFILE_C= ${CC} -c ${CFLAGS} $<
+NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
+NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
+NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${.IMPSRC}
+PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
 
 GEN_CFILES= $S/$M/$M/genassym.c
 # setdef0.c and setdef1.c are intentionally
@@ -132,9 +129,9 @@ ${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
 .endif
 
 clean:
-	rm -f *.o *.so *.So *.ko *.s eddep errs genassym gensetdefs \
-	      ${KERNEL} ${FULLKERNEL} linterrs makelinks param.c \
-	      setdef[01].c setdefs.h symbols.exclude symbols.sort tags \
+	rm -f *.o *.so *.So *.ko *.s eddep errs genassym \
+	      ${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
+	      setdef[01].c setdefs.h tags \
 	      vers.c vnode_if.c vnode_if.h ${CLEAN}
 
 #lint: /tmp param.c
@@ -174,7 +171,7 @@ assym.s: genassym.o
 	genassym genassym.o >assym.s
 
 genassym.o: $S/$M/$M/genassym.c
-	${CC} -c ${GEN_CFLAGS} $S/$M/$M/genassym.c
+	${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
 
 SYSTEM_OBJS+=	__divqu.o __divq.o __divlu.o __divl.o
 SYSTEM_OBJS+=	__remqu.o __remq.o __remlu.o __reml.o
@@ -226,8 +223,7 @@ ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
 depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .newdep
-	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES}
-	mkdep -a -f .newdep ${GEN_CFLAGS} ${GEN_CFILES}
+	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES}
 	env MKDEP_CPP="${CC} -E" \
 	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
 	rm -f .depend
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 09cc43d..e3c5028 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -40,6 +40,7 @@
 #include <stddef.h>
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/assym.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
@@ -56,9 +57,7 @@
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
-#define _KERNEL	/* Avoid userland compatability headers */
 #include <sys/user.h>
-#undef _KERNEL
 #include <net/if.h>
 #include <netinet/in.h>
 #include <nfs/nfsv2.h>