[src/netbsd-7]: src/bin/sh Pull up following revision(s) (requested by martin...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/12da21bd8ec1
branches:  netbsd-7
changeset: 799405:12da21bd8ec1
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jun 04 07:35:25 2015 +0000

description:
Pull up following revision(s) (requested by martin in ticket #821):
        bin/sh/builtins.def: revision 1.23
        bin/sh/Makefile: revision 1.101
Include printf by default even for SMALL builds. It is used e.g. by
dhcpcd and as such required by most ramdisk images. Allow turning it off
again by TINYPROG.

diffstat:

 bin/sh/Makefile     |  5 ++++-
 bin/sh/builtins.def |  4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 8ab575a2fba0 -r 12da21bd8ec1 bin/sh/Makefile
--- a/bin/sh/Makefile   Thu Jun 04 07:34:26 2015 +0000
+++ b/bin/sh/Makefile   Thu Jun 04 07:35:25 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.100 2014/07/05 23:13:41 dholland Exp $
+#      $NetBSD: Makefile,v 1.100.2.1 2015/06/04 07:35:25 msaitoh Exp $
 #      @(#)Makefile    8.4 (Berkeley) 5/5/95
 
 .include <bsd.own.mk>
@@ -42,6 +42,9 @@
 
 .ifdef SMALLPROG
 CPPFLAGS+=-DSMALL
+.endif
+.ifdef TINYPROG
+CPPFLAGS+=-DTINY
 .else
 SRCS+=printf.c
 .endif
diff -r 8ab575a2fba0 -r 12da21bd8ec1 bin/sh/builtins.def
--- a/bin/sh/builtins.def       Thu Jun 04 07:34:26 2015 +0000
+++ b/bin/sh/builtins.def       Thu Jun 04 07:35:25 2015 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: builtins.def,v 1.22 2012/12/31 14:10:15 dsl Exp $
+#      $NetBSD: builtins.def,v 1.22.10.1 2015/06/04 07:35:25 msaitoh Exp $
 #
 # Copyright (c) 1991, 1993
 #      The Regents of the University of California.  All rights reserved.
@@ -66,7 +66,7 @@
 jobidcmd       jobid
 jobscmd                -u jobs
 localcmd       local
-#ifndef SMALL
+#ifndef TINY
 printfcmd      printf
 #endif
 pwdcmd         -u pwd