MFC: "nocpu" and "nomakeoptions" directives.

usr.sbin/config/config.y

@@ -8,6 +8,7 @@
 %token	COMMA
 %token	CONFIG
 %token	CPU
+%token	NOCPU
 %token	DEVICE
 %token	NODEVICE
 %token	ENV
@@ -157,6 +158,17 @@ Config_spec:
 		cp->cpu_name = $2;
 		SLIST_INSERT_HEAD(&cputype, cp, cpu_next);
 	      } |
+	NOCPU Save_id
+	      = {
+		struct cputype *cp, *cp2;
+		SLIST_FOREACH_SAFE(cp, &cputype, cpu_next, cp2) {
+			if (strcmp(cp->cpu_name, $2) != 0)
+				continue;
+			SLIST_REMOVE(&cputype, cp, cputype, cpu_next);
+			free(cp);
+			break;
+		}
+	      } |
 	OPTIONS Opt_list
 		|
 	NOOPTION Save_id

usr.sbin/config/lang.l

@@ -62,6 +62,7 @@ struct kt {
 } key_words[] = {
 	{ "config",	CONFIG },
 	{ "cpu",	CPU },
+	{ "nocpu",	NOCPU },
 	{ "device",	DEVICE },
 	{ "devices",	DEVICE },
 	{ "nodevice",	NODEVICE },
@@ -72,6 +73,7 @@ struct kt {
 	{ "machine",	ARCH }, /* MACHINE is defined in /sys/param.h */
 	{ "makeoptions", MAKEOPTIONS },
 	{ "nomakeoption", NOMAKEOPTION },
+	{ "nomakeoptions", NOMAKEOPTION },
 	{ "maxusers",	MAXUSERS },
 	{ "profile",	PROFILE },
 	{ "option",	OPTIONS },