From owner-p4-projects@FreeBSD.ORG  Tue May 27 04:33:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 28B311065670; Tue, 27 May 2008 04:33:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE894106564A
	for <perforce@freebsd.org>; Tue, 27 May 2008 04:33:22 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CB2C28FC19
	for <perforce@freebsd.org>; Tue, 27 May 2008 04:33:22 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4R4XMlp032856
	for <perforce@freebsd.org>; Tue, 27 May 2008 04:33:22 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4R4XMQ8032854
	for perforce@freebsd.org; Tue, 27 May 2008 04:33:22 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 27 May 2008 04:33:22 GMT
Message-Id: <200805270433.m4R4XMQ8032854@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 142362 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2008 04:33:23 -0000

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

Change 142362 by jb@freebsd3 on 2008/05/27 04:32:46

	Reset to match RELENG_7 with just he DTrace changes.

Affected files ...

.. //depot/projects/dtrace7/src/share/mk/sys.mk#9 edit

Differences ...

==== //depot/projects/dtrace7/src/share/mk/sys.mk#9 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)sys.mk	8.2 (Berkeley) 3/21/94
-# $FreeBSD: src/share/mk/sys.mk,v 1.102 2008/05/22 01:14:43 jb Exp $
+# $FreeBSD: src/share/mk/sys.mk,v 1.92.2.2 2008/01/24 13:33:00 ru Exp $
 
 unix		?=	We run FreeBSD, not UNIX.
 .FreeBSD	?=	true
@@ -35,15 +35,12 @@
 CFLAGS		?=	-O
 .else
 CC		?=	cc
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips"
-CFLAGS		?=	-O -pipe
+.if ${MACHINE_ARCH} == "arm"
+CFLAGS		?=	-O -fno-strict-aliasing -pipe
 .else
-CFLAGS		?=	-O2 -pipe
+CFLAGS		?=	-O2 -fno-strict-aliasing -pipe
 .endif
-.if defined(NO_STRICT_ALIASING)
-CFLAGS		+=	-fno-strict-aliasing
 .endif
-.endif
 
 # Turn CTF conversion off by default for now. This default could be
 # changed later if DTrace becomes popular.
@@ -339,11 +336,6 @@
 .include "${__MAKE_CONF}"
 .endif
 
-.if defined(__MAKE_SHELL) && !empty(__MAKE_SHELL)
-SHELL=	${__MAKE_SHELL}
-.SHELL: path=${__MAKE_SHELL}
-.endif
-
 # Default executable format
 # XXX hint for bsd.port.mk
 OBJFORMAT?=	elf