svn commit: r204043 - in user/imp/tbemd: share/mk sys/dev/aac tools/regression/bin/sh/expansion usr.bin

[Warner Losh]

Author: imp
Date: Thu Feb 18 15:12:48 2010
New Revision: 204043
URL: http://svn.freebsd.org/changeset/base/204043

Log:
  Merge from head.

Added:
  user/imp/tbemd/tools/regression/bin/sh/expansion/arith3.0
     - copied unchanged from r204030, head/tools/regression/bin/sh/expansion/arith3.0
Modified:
  user/imp/tbemd/share/mk/bsd.prog.mk
  user/imp/tbemd/share/mk/bsd.sys.mk
  user/imp/tbemd/share/mk/sys.mk
  user/imp/tbemd/sys/dev/aac/aac.c
  user/imp/tbemd/usr.bin/Makefile
Directory Properties:
  user/imp/tbemd/   (props changed)

Modified: user/imp/tbemd/share/mk/bsd.prog.mk
==============================================================================
--- user/imp/tbemd/share/mk/bsd.prog.mk	Thu Feb 18 15:00:43 2010	(r204042)
+++ user/imp/tbemd/share/mk/bsd.prog.mk	Thu Feb 18 15:12:48 2010	(r204043)
@@ -17,6 +17,7 @@ NO_WERROR=
 
 .if defined(DEBUG_FLAGS)
 CFLAGS+=${DEBUG_FLAGS}
+CXXFLAGS+=${DEBUG_FLAGS}
 
 .if !defined(NO_CTF) && (${DEBUG_FLAGS:M-g} != "")
 CTFFLAGS+= -g

Modified: user/imp/tbemd/share/mk/bsd.sys.mk
==============================================================================
--- user/imp/tbemd/share/mk/bsd.sys.mk	Thu Feb 18 15:00:43 2010	(r204042)
+++ user/imp/tbemd/share/mk/bsd.sys.mk	Thu Feb 18 15:12:48 2010	(r204043)
@@ -43,7 +43,10 @@ CWARNFLAGS	+=	-W -Wno-unused-parameter -
 .  endif
 .  if ${WARNS} >= 4
 CWARNFLAGS	+=	-Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\
-			-Wshadow -Wcast-align -Wunused-parameter
+			-Wshadow -Wunused-parameter
+.   if !defined(NO_WCAST_ALIGN)
+CWARNFLAGS	+=	-Wcast-align
+.   endif
 .  endif
 # BDECFLAGS
 .  if ${WARNS} >= 6

Modified: user/imp/tbemd/share/mk/sys.mk
==============================================================================
--- user/imp/tbemd/share/mk/sys.mk	Thu Feb 18 15:00:43 2010	(r204042)
+++ user/imp/tbemd/share/mk/sys.mk	Thu Feb 18 15:12:48 2010	(r204043)
@@ -78,7 +78,7 @@ CFLAGS		+=	-g
 .endif
 
 CXX		?=	c++
-CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign}
+CXXFLAGS	?=	${CFLAGS:N-std=*:N-Wnested-externs:N-W*-prototypes:N-Wno-pointer-sign:N-Wold-style-definition}
 PO_CXXFLAGS	?=	${CXXFLAGS}
 
 CPP		?=	cpp

Modified: user/imp/tbemd/sys/dev/aac/aac.c
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aac.c	Thu Feb 18 15:00:43 2010	(r204042)
+++ user/imp/tbemd/sys/dev/aac/aac.c	Thu Feb 18 15:12:48 2010	(r204043)
@@ -2352,8 +2352,9 @@ aac_timeout(struct aac_softc *sc)
 			/* && !(cm->cm_flags & AAC_CMD_TIMEDOUT) */) {
 			cm->cm_flags |= AAC_CMD_TIMEDOUT;
 			device_printf(sc->aac_dev,
-				      "COMMAND %p TIMEOUT AFTER %d SECONDS\n",
-				      cm, (int)(time_uptime-cm->cm_timestamp));
+			    "COMMAND %p (TYPE %d) TIMEOUT AFTER %d SECONDS\n",
+			    cm, cm->cm_fib->Header.Command,
+			    (int)(time_uptime-cm->cm_timestamp));
 			AAC_PRINT_FIB(sc, cm->cm_fib);
 			timedout++;
 		}

Copied: user/imp/tbemd/tools/regression/bin/sh/expansion/arith3.0 (from r204030, head/tools/regression/bin/sh/expansion/arith3.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/imp/tbemd/tools/regression/bin/sh/expansion/arith3.0	Thu Feb 18 15:12:48 2010	(r204043, copy of r204030, head/tools/regression/bin/sh/expansion/arith3.0)
@@ -0,0 +1,14 @@
+# $FreeBSD$
+
+failures=0
+
+check() {
+	if [ $(($1)) != $2 ]; then
+		failures=$((failures+1))
+		echo "For $1, expected $2 actual $(($1))"
+	fi
+}
+
+check "1 << 1 + 1 | 1" 5
+
+exit $((failures != 0))

Modified: user/imp/tbemd/usr.bin/Makefile
==============================================================================
--- user/imp/tbemd/usr.bin/Makefile	Thu Feb 18 15:00:43 2010	(r204042)
+++ user/imp/tbemd/usr.bin/Makefile	Thu Feb 18 15:12:48 2010	(r204043)
@@ -5,7 +5,7 @@
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
-# XXX Use GNU versions: apropos bc dc diff grep ld man patch whatis
+# XXX Use GNU versions: apropos diff grep ld man patch whatis
 # Moved to secure: bdes
 #