Module Name: src
Committed By: rillig
Date: Sun Jun 14 23:13:21 UTC 2020
Modified Files:
src/usr.bin/make: str.c
src/usr.bin/make/unit-tests: modmatch.mk
Log Message:
usr.bin/make: revert performance improvement
That change might be the cause of a build failure for vax.
http://releng.netbsd.org/builds/HEAD/202006131940Z/ builds fine.
http://releng.netbsd.org/builds/HEAD/202006141020Z/ doesn't.
The build fails with:
/home/source/ab/HEAD/src/external/gpl3/gcc/dist/gcc/machmode.h:524:28:
error: 'mode_size_inline' was not declared in this scope
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/make/str.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/modmatch.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/str.c
diff -u src/usr.bin/make/str.c:1.46 src/usr.bin/make/str.c:1.47
--- src/usr.bin/make/str.c:1.46 Sat Jun 13 21:16:27 2020
+++ src/usr.bin/make/str.c Sun Jun 14 23:13:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: str.c,v 1.46 2020/06/13 21:16:27 rillig Exp $ */
+/* $NetBSD: str.c,v 1.47 2020/06/14 23:13:21 rillig Exp $ */
/*-
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: str.c,v 1.46 2020/06/13 21:16:27 rillig Exp $";
+static char rcsid[] = "$NetBSD: str.c,v 1.47 2020/06/14 23:13:21 rillig Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)str.c 5.8 (Berkeley) 6/1/90";
#else
-__RCSID("$NetBSD: str.c,v 1.46 2020/06/13 21:16:27 rillig Exp $");
+__RCSID("$NetBSD: str.c,v 1.47 2020/06/14 23:13:21 rillig Exp $");
#endif
#endif /* not lint */
#endif
@@ -355,8 +355,6 @@ Str_Match(const char *string, const char
*/
if (*pattern == '*') {
pattern++;
- while (*pattern == '*')
- pattern++;
if (*pattern == 0)
return 1;
while (*string != 0) {
Index: src/usr.bin/make/unit-tests/modmatch.mk
diff -u src/usr.bin/make/unit-tests/modmatch.mk:1.4 src/usr.bin/make/unit-tests/modmatch.mk:1.5
--- src/usr.bin/make/unit-tests/modmatch.mk:1.4 Sat Jun 13 21:16:27 2020
+++ src/usr.bin/make/unit-tests/modmatch.mk Sun Jun 14 23:13:21 2020
@@ -36,4 +36,4 @@ check-cclass:
# Before 2020-06-13, this expression took quite a long time in Str_Match,
# calling itself 601080390 times for 16 asterisks.
slow: .PHONY
- @:;: ${:U****************:M****************b:Q}
+# @:;: ${:U****************:M****************b:Q}
