PERFORCE change 142362 for review

[John Birrell]

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

Change 142362 by jb at 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