From owner-p4-projects  Sat Jan 25  0:30:49 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3DFFB37B405; Sat, 25 Jan 2003 00:30:47 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CB41637B401
	for <perforce@freebsd.org>; Sat, 25 Jan 2003 00:30:46 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 784EA43EB2
	for <perforce@freebsd.org>; Sat, 25 Jan 2003 00:30:46 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0P8Ukbv014412
	for <perforce@freebsd.org>; Sat, 25 Jan 2003 00:30:46 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0P8UkaR014406
	for perforce@freebsd.org; Sat, 25 Jan 2003 00:30:46 -0800 (PST)
Date: Sat, 25 Jan 2003 00:30:46 -0800 (PST)
Message-Id: <200301250830.h0P8UkaR014406@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
Subject: PERFORCE change 24175 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=24175

Change 24175 by jmallett@jmallett_dalek on 2003/01/25 00:30:31

	Make the platform keyword imply an options one...
	e.g.:
	
	platform	sgimips
	
	implies not only to create a symlink for <platform> to <sgimips> but
	also,
	
	options 	SGIMIPS

Affected files ...

.. //depot/projects/mips/sys/mips/conf/GENERIC#6 edit
.. //depot/projects/mips/usr.sbin/config/mkoptions.c#2 edit

Differences ...

==== //depot/projects/mips/sys/mips/conf/GENERIC#6 (text+ko) ====

@@ -11,9 +11,7 @@
 makeoptions	WERROR=-Wno-error	#XXX: We don't want -Werror just now
 
 # Platform support
-platform	sgimips			#SGI MIPS guts
-# XXX Should be implied by the above.
-options 	SGIMIPS			#SGI MIPS hardware
+platform	sgimips			#SGI MIPS systems.
 
 # Hardware support
 device		arcbios			#ARCBIOS

==== //depot/projects/mips/usr.sbin/config/mkoptions.c#2 (text+ko) ====

@@ -78,7 +78,20 @@
 		op->op_name = ns(cp->cpu_name);
 		op->op_next = opt;
 		opt = op;
-	}	
+	}
+
+	/* Fake the platform as an option. */
+	if (platformname != NULL) {
+		char *p;
+
+		op = (struct opt *)malloc(sizeof(*op));
+		memset(op, 0, sizeof(*op));
+		op->op_name = ns(platformname);
+		for (p = op->op_name; *p != '\0'; p++)
+			*p = toupper((unsigned char)*p);
+		op->op_next = opt;
+		opt = op;
+	}
 
 	if (maxusers == 0) {
 		/* printf("maxusers not specified; will auto-size\n"); */

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message