Move genassym in /sys

sys/arch/amd64/amd64/genassym.c

@@ -137,8 +137,8 @@ int main(void)
 	fprintf(fp, "#define CPU_INFO_MDS_BUF %zu\n", my_offsetof(struct cpu_info, ci_mds_buf));
 	fprintf(fp, "#define CPU_INFO_MDS_TMP %zu\n", my_offsetof(struct cpu_info, ci_mds_tmp));
 
-	fprintf(fp, "#define CPUF_USERSEGS %d\n", CPUF_USERSEGS);
-	fprintf(fp, "#define CPUF_USERXSTATE %d\n", CPUF_USERXSTATE);
+	fprintf(fp, "#define CPUPF_USERSEGS %d\n", CPUPF_USERSEGS);
+	fprintf(fp, "#define CPUPF_USERXSTATE %d\n", CPUPF_USERXSTATE);
 
 	fprintf(fp, "#define INTRSOURCE_SIZEOF %lu\n", sizeof(struct intrsource));
 	fprintf(fp, "#define IS_RECURSE %zu\n", my_offsetof(struct intrsource, is_recurse));

sys/arch/amd64/conf/Makefile.amd64

@@ -131,16 +131,10 @@ CFLAGS+=	-fno-wrapv
 
 %LOAD
 
-# cc's -MD puts the source and output paths in the dependency file;
-# since those are temp files here we need to fix it up.  It also
-# puts the file in /tmp, so we use -MF to put it in the current
-# directory as assym.P and then generate assym.d from it with a
-# good target name
-assym.h: $S/kern/genassym.sh Makefile \
-	 ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf
-	cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \
-	    sh $S/kern/genassym.sh ${CC} ${NO_INTEGR_AS} ${CFLAGS} ${CPPFLAGS} -MF assym.P > assym.h.tmp
-	sed '1s/.*/assym.h: \\/' assym.P > assym.d
+assym.h: ${_archdir}/${_arch}/genassym.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -I$S/../include/ -o \
+	${_archdir}/${_arch}/genassym ${_archdir}/${_arch}/genassym.c
+	${_archdir}/${_arch}/genassym > assym.h.tmp
 	sort -u assym.h.tmp > assym.h
 
 param.c: $S/conf/param.c

usr.bin/genassym/Makefile

@@ -1,7 +0,0 @@
-#	$OpenBSD: Makefile,v 1.3 1997/09/21 11:48:51 deraadt Exp $
-
-PROG=	my_genassym
-
-CFLAGS += -I/sys/arch -I/sys -D_KERNEL
-
-.include <bsd.prog.mk>