Updating usr.bin/make

Change-Id: I66b137a0368cf99267cd47a9625da8a12d8a1df7
This commit is contained in:
2013-01-14 11:36:27 +01:00
parent 71c7dcb9ce
commit 2bc7c627ac
24 changed files with 421 additions and 182 deletions
+7 -7
View File
@@ -1,4 +1,4 @@
/* $NetBSD: make.c,v 1.85 2012/04/07 18:29:08 christos Exp $ */
/* $NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
static char rcsid[] = "$NetBSD: make.c,v 1.85 2012/04/07 18:29:08 christos Exp $";
static char rcsid[] = "$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)make.c 8.1 (Berkeley) 6/6/93";
#else
__RCSID("$NetBSD: make.c,v 1.85 2012/04/07 18:29:08 christos Exp $");
__RCSID("$NetBSD: make.c,v 1.87 2012/06/12 19:21:51 joerg Exp $");
#endif
#endif /* not lint */
#endif
@@ -139,7 +139,7 @@ static int MakeCheckOrder(void *, void *);
static int MakeBuildChild(void *, void *);
static int MakeBuildParent(void *, void *);
__dead static void
MAKE_ATTR_DEAD static void
make_abort(GNode *gn, int line)
{
static int two = 2;
@@ -221,7 +221,7 @@ Make_OODate(GNode *gn)
* doesn't depend on their modification time...
*/
if ((gn->type & (OP_JOIN|OP_USE|OP_USEBEFORE|OP_EXEC)) == 0) {
(void)Dir_MTime(gn, 0);
(void)Dir_MTime(gn, 1);
if (DEBUG(MAKE)) {
if (gn->mtime != 0) {
fprintf(debug_file, "modified %s...", Targ_FmtTime(gn->mtime));
@@ -867,7 +867,7 @@ Make_Update(GNode *cgn)
*-----------------------------------------------------------------------
*/
static int
MakeUnmark(void *cgnp, void *pgnp __unused)
MakeUnmark(void *cgnp, void *pgnp MAKE_ATTR_UNUSED)
{
GNode *cgn = (GNode *)cgnp;
@@ -1005,7 +1005,7 @@ Make_DoAllVar(GNode *gn)
*/
static int
MakeCheckOrder(void *v_bn, void *ignore __unused)
MakeCheckOrder(void *v_bn, void *ignore MAKE_ATTR_UNUSED)
{
GNode *bn = v_bn;