[src/trunk]: src/usr.bin/make usr.bin/make: revert performance improvement

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

details:   https://anonhg.NetBSD.org/src/rev/dbf81e68619b
branches:  trunk
changeset: 934627:dbf81e68619b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Sun Jun 14 23:13:21 2020 +0000

description:
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

diffstat:

 usr.bin/make/str.c                  |  8 +++-----
 usr.bin/make/unit-tests/modmatch.mk |  2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 3451a13041b5 -r dbf81e68619b usr.bin/make/str.c
--- a/usr.bin/make/str.c        Sun Jun 14 22:30:44 2020 +0000
+++ b/usr.bin/make/str.c        Sun Jun 14 23:13:21 2020 +0000
@@ -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 @@
                 */
                if (*pattern == '*') {
                        pattern++;
-                       while (*pattern == '*')
-                               pattern++;
                        if (*pattern == 0)
                                return 1;
                        while (*string != 0) {
diff -r 3451a13041b5 -r dbf81e68619b usr.bin/make/unit-tests/modmatch.mk
--- a/usr.bin/make/unit-tests/modmatch.mk       Sun Jun 14 22:30:44 2020 +0000
+++ b/usr.bin/make/unit-tests/modmatch.mk       Sun Jun 14 23:13:21 2020 +0000
@@ -36,4 +36,4 @@
 # 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}