22137282 upgrade gnu make to 4.1
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 09 Nov 2015 10:55:50 -0800
changeset 5074 24b9f318a3b0
parent 5073 8aa7f7f76c01
child 5075 be426baa4471
22137282 upgrade gnu make to 4.1 18167474 /usr/gnu/bin/make dumps core with fuzz input 21467969 hplip build fails with gnu make 4.1
components/hplip/Makefile
components/make/Makefile
components/make/make.p5m
components/make/patches/30612.patch
components/make/patches/30723.patch
components/make/patches/32511.patch
components/make/patches/33873.patch
components/make/patches/36106.patch
components/make/patches/Makefile.patch
components/make/patches/tests.patch
components/make/test/results-64.master
components/make/test/system-results-64.master
--- a/components/hplip/Makefile	Mon Nov 09 09:47:32 2015 -0800
+++ b/components/hplip/Makefile	Mon Nov 09 10:55:50 2015 -0800
@@ -83,8 +83,6 @@
 $(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-hpijs-only-build
 $(HPIJS_VARIANT)/.configured: CONFIGURE_OPTIONS += --enable-hpijs-install
 
-install: COMPONENT_INSTALL_ENV += halpredir=/etc/hal/fdi/preprobe/10osvendor
-
 COMPONENT_INSTALL_ARGS += -e
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
--- a/components/make/Makefile	Mon Nov 09 09:47:32 2015 -0800
+++ b/components/make/Makefile	Mon Nov 09 10:55:50 2015 -0800
@@ -26,26 +26,29 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		make
-COMPONENT_VERSION=	3.82
+COMPONENT_VERSION=	4.1
 COMPONENT_PROJECT_URL=	http://www.gnu.org/software/make/
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:3d991b33e604187c5881a0abc2e102d5b9776da5569640e73778f85d617242e7
+    sha256:0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/make/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/gnu-make
 
-TPNO=			5521
+TPNO=			24441
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/configure.mk
 include $(WS_MAKE_RULES)/ips.mk
 
+PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+
 CONFIGURE_BINDIR.64 =   $(CONFIGURE_PREFIX)/bin
 
 CONFIGURE_OPTIONS  +=		--program-prefix=g
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
+CONFIGURE_OPTIONS  +=		--without-guile
 
 # force re-runs to be the same
 COMPONENT_PRE_TEST_ACTION = \
--- a/components/make/make.p5m	Mon Nov 09 09:47:32 2015 -0800
+++ b/components/make/make.p5m	Mon Nov 09 10:55:50 2015 -0800
@@ -39,6 +39,7 @@
 link path=usr/bin/gmake target=../gnu/bin/make facet.compat.gnulinks=true
 file usr/bin/gmake path=usr/gnu/bin/make
 file usr/share/man/man1/gmake.1 path=usr/gnu/share/man/man1/make.1
+file path=usr/include/gnumake.h
 link path=usr/sfw/bin/gmake target=../../gnu/bin/make
 link path=usr/sfw/share/man/man1/gmake.1 \
     target=../../../../gnu/share/man/man1/make.1
@@ -46,6 +47,7 @@
 file path=usr/share/info/make.info-1
 file path=usr/share/info/make.info-2
 file path=usr/share/locale/be/LC_MESSAGES/make.mo
+file path=usr/share/locale/cs/LC_MESSAGES/make.mo
 file path=usr/share/locale/da/LC_MESSAGES/make.mo
 file path=usr/share/locale/de/LC_MESSAGES/make.mo
 file path=usr/share/locale/es/LC_MESSAGES/make.mo
--- a/components/make/patches/30612.patch	Mon Nov 09 09:47:32 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-This patch is taken from:
-http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.193&r2=1.194
-
-Fix various errors parsing archives with multiple objects in the parenthesis,
-as well as wildcards. Fixes Savannah bug #30612.
-
-https://savannah.gnu.org/bugs/?30612
-
-Second patch is a followup for that bug as well:
-http://cvs.savannah.gnu.org/viewvc/make/read.c?root=make&r1=1.200&r2=1.201
-
---- a/read.c	2010/07/13 01:20:42	1.193
-+++ b/read.c	2010/08/14 02:50:14	1.194
[email protected]@ -3028,7 +3028,7 @@
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
[email protected]@ -3084,19 +3084,19 @@
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
[email protected]@ -3152,7 +3152,10 @@
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
-
---- a/read.c	2011/05/07 14:36:12	1.200
-+++ b/read.c	2011/06/12 16:22:04	1.201
[email protected]@ -3044,16 +3044,16 @@
-                       nlen -= (n + 1) - tp;
-                       tp = n + 1;
- 
--                      /* If we have just "lib(", part of something like
--                         "lib( a b)", go to the next item.  */
--                      if (! nlen)
--                        continue;
--
-                       /* We can stop looking now.  */
-                       break;
-                     }
-                 }
-               while (*e != '\0');
-+
-+              /* If we have just "lib(", part of something like "lib( a b)",
-+                 go to the next item.  */
-+              if (! nlen)
-+                continue;
-             }
-         }
- 
--- a/components/make/patches/30723.patch	Mon Nov 09 09:47:32 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-This patch is taken from:
-http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.243&r2=1.244
-
-Fix Savannah bug #30723:
-expand MAKEFLAGS before we re-exec after rebuilding makefiles.
-
-bug #30723: implicit re-executing of subdirs breaks $(origin) with make-3.82
-https://savannah.gnu.org/bugs/?30723
-
---- a/main.c	2010/07/19 07:10:53	1.243
-+++ b/main.c	2010/08/10 07:35:34	1.244
[email protected]@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
--- a/components/make/patches/32511.patch	Mon Nov 09 09:47:32 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-This diff is taken from git:
-https://github.com/scfc/gnumake/commit/d952d36acf66398b7fe1e3efa15af73add937ecb
-minus changes in the 'Changelog' files which don't apply cleanly to our sources
-
-and it fixes Savannah bug 32511
-http://savannah.gnu.org/bugs/?32511
-
-diff --git a/ChangeLog b/ChangeLog
-index 2345823..e2a9786 100644
-diff --git a/remake.c b/remake.c
-index 669eadc..5526624 100644
---- a/remake.c
-+++ b/remake.c
[email protected]@ -1534,8 +1534,7 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
-   unsigned int liblen;
- 
-   /* Information about the earliest (in the vpath sequence) match.  */
--  unsigned int best_vpath, best_path;
--  unsigned int std_dirs = 0;
-+  unsigned int best_vpath = 0, best_path = 0;
- 
-   char **dp;
- 
[email protected]@ -1554,6 +1553,7 @@ library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr)
-       static char *buf = NULL;
-       static unsigned int buflen = 0;
-       static int libdir_maxlen = -1;
-+      static unsigned int std_dirs = 0;
-       char *libbuf = variable_expand ("");
- 
-       /* Expand the pattern using LIB as a replacement.  */
-diff --git a/tests/scripts/features/vpath3 b/tests/scripts/features/vpath3
-index 978c5ee..c6ede28 100644
---- a/tests/scripts/features/vpath3
-+++ b/tests/scripts/features/vpath3
[email protected]@ -1,50 +1,35 @@
--#                                                                     -*-perl-*-
-+#                                                                    -*-perl-*-
- 
- $description = "Test the interaction of the -lfoo feature and vpath";
- $details = "";
- 
--open(MAKEFILE,"> $makefile");
--
--# The Contents of the MAKEFILE ...
--
--print MAKEFILE "vpath %.a a1\n";
--print MAKEFILE "vpath %.so b1\n";
--print MAKEFILE "vpath % a2 b2\n";
--print MAKEFILE "vpath % b3\n";
--print MAKEFILE "all: -l1 -l2 -l3; \@echo \$^\n";
--
--# END of Contents of MAKEFILE
--
--close(MAKEFILE);
--
--mkdir("a1", 0777);
--mkdir("b1", 0777);
--mkdir("a2", 0777);
--mkdir("b2", 0777);
--mkdir("b3", 0777);
--
[email protected]_to_touch = ("a1${pathsep}lib1.a",
--		   "b1${pathsep}lib1.so",
--		   "a2${pathsep}lib2.a",
--		   "b2${pathsep}lib2.so",
--		   "lib3.a",
--		   "b3${pathsep}lib3.so");
-+my @dirs_to_make = qw(a1 b1 a2 b2 b3);
-+for my $d (@dirs_to_make) {
-+    mkdir($d, 0777);
-+}
- 
-+my @files_to_touch = ("a1${pathsep}lib1.a",
-+                      "a1${pathsep}libc.a",
-+                      "b1${pathsep}lib1.so",
-+                      "a2${pathsep}lib2.a",
-+                      "b2${pathsep}lib2.so",
-+                      "lib3.a",
-+                      "b3${pathsep}lib3.so");
- &touch(@files_to_touch);
- 
--&run_make_with_options($makefile,"",&get_logfile);
--
--# Create the answer to what should be produced by this Makefile
--$answer = "a1${pathsep}lib1.a a2${pathsep}lib2.a lib3.a\n";
--
--if (&compare_output($answer,&get_logfile(1)))
--{
--  unlink @files_to_touch;
--  rmdir("a1");
--  rmdir("b1");
--  rmdir("a2");
--  rmdir("b2");
--  rmdir("b3");
-+run_make_test('
-+vpath %.h b3
-+vpath %.a a1
-+vpath %.so b1
-+vpath % a2 b2
-+vpath % b3
-+all: -l1 -lc -l2 -l3; @echo $^
-+',
-+              '', "a1${pathsep}lib1.a a1${pathsep}libc.a a2${pathsep}lib2.a lib3.a\n");
-+
-+unlink(@files_to_touch);
-+for my $d (@dirs_to_make) {
-+    rmdir($d);
- }
- 
- 1;
--- a/components/make/patches/33873.patch	Mon Nov 09 09:47:32 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-This patch is taken from:
-http://cvs.savannah.gnu.org/viewvc/make/main.c?root=make&r1=1.246&r2=1.247
-
-When we re-exec the master makefile in a jobserver environment, ensure
-that MAKEFLAGS is set properly so the re-exec'd make runs in parallel.
-See Savannah bug #33873.
-
-bug #33873: MAKEFLAGS=-jN gets lost on reexec
-https://savannah.gnu.org/bugs/?33873
-
-sr #107487: MAKEFLAGS not being honored always (regression) in 3.82
-https://savannah.gnu.org/support/index.php?107487
-
---- a/main.c	2010/08/29 23:05:27	1.246
-+++ b/main.c	2011/09/18 23:39:26	1.247
[email protected]@ -2088,6 +2088,11 @@
- 
-           ++restarts;
- 
-+          /* If we're re-exec'ing the first make, put back the number of
-+             job slots so define_makefiles() will get it right.  */
-+          if (master_job_slots)
-+            job_slots = master_job_slots;
-+
-           /* Reset makeflags in case they were changed.  */
-           {
-             const char *pv = define_makeflags (1, 1);
[email protected]@ -2824,9 +2829,6 @@
- 		       && (*(unsigned int *) cs->value_ptr ==
- 			   *(unsigned int *) cs->noarg_value))
- 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
--	      else if (cs->c == 'j')
--		/* Special case for `-j'.  */
--		ADD_FLAG ("1", 1);
- 	      else
- 		{
- 		  char *buf = alloca (30);
--- a/components/make/patches/36106.patch	Mon Nov 09 09:47:32 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-This patch is submitted upstream as:
-
-bug #36106: make target-specific variables fail if over 150 characters and contain semicolon
-http://savannah.gnu.org/bugs/index.php?36106
-
---- a/read.c	2010-07-13 03:20:42.000000000 +0200
-+++ b/read.c	2012-04-05 23:25:12.155011371 +0200
[email protected]@ -1071,12 +1071,12 @@
-                after it.  */
-             if (semip)
-               {
--                unsigned int l = p - variable_buffer;
-+                unsigned int l = p2 - variable_buffer;
-                 *(--semip) = ';';
-                 collapse_continuations (semip);
-                 variable_buffer_output (p2 + strlen (p2),
-                                         semip, strlen (semip)+1);
--                p = variable_buffer + l;
-+                p2 = variable_buffer + l;
-               }
-             record_target_var (filenames, p2,
-                                vmod.override_v ? o_override : o_file,
--- a/components/make/patches/Makefile.patch	Mon Nov 09 09:47:32 2015 -0800
+++ b/components/make/patches/Makefile.patch	Mon Nov 09 10:55:50 2015 -0800
@@ -1,6 +1,6 @@
---- make-3.82/Makefile.in.orig	Tue Apr 14 12:59:38 2015
-+++ make-3.82/Makefile.in	Tue Apr 14 13:00:41 2015
[email protected]@ -1116,6 +1116,26 @@
+--- make-4.1.orig/Makefile.in	Sun Oct  5 09:25:22 2014
++++ make-4.1/Makefile.in	Sat Oct 31 13:56:50 2015
[email protected]@ -1265,6 +1265,26 @@
  	  echo "Can't find the GNU Make test suite ($(srcdir)/tests)."; \
  	 fi
  
--- a/components/make/patches/tests.patch	Mon Nov 09 09:47:32 2015 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-This is taken from upstream:
-
-http://cvs.savannah.gnu.org/viewvc/make/make/tests/scripts/targets/SECONDARY?r1=1.6&r2=1.7
-
---- make-3.82/tests/scripts/targets/SECONDARY.orig	Tue Jan 20 08:36:09 2015
-+++ make-3.82/tests/scripts/targets/SECONDARY	Tue Jan 20 08:37:29 2015
[email protected]@ -129,10 +129,11 @@
- run_make_test('
- %.c : %.b ; cp $< [email protected]
- %.b : %.a ; cp $< [email protected]
--all : 1.c 2.c', '-rR -j',
-+all : 1.c 2.c
-+2.a: 1.c', '-rR -j',
- 'cp 1.a 1.b
--cp 2.a 2.b
- cp 1.b 1.c
-+cp 2.a 2.b
- cp 2.b 2.c
- rm 1.b 2.b');
- 
--- a/components/make/test/results-64.master	Mon Nov 09 09:47:32 2015 -0800
+++ b/components/make/test/results-64.master	Mon Nov 09 10:55:50 2015 -0800
@@ -3,44 +3,51 @@
 Making check in config
 make[2]: Nothing to be done for `check'.
 Making check in po
-make[2]: Nothing to be done for `check'.
 Making check in doc
 make[2]: Nothing to be done for `check'.
 /usr/gnu/bin/make  loadavg
-"$(SOURCE_DIR)/getloadavg.c", line 1006: warning: implicit function declaration: getloadavg
+"$(SOURCE_DIR)/getloadavg.c", line 1004: warning: implicit function declaration: getloadavg
 /usr/gnu/bin/make  check-local
-cd tests && perl ./run_make_tests.pl -make ../make 
+cd tests && perl ./run_make_tests.pl -srcdir $(SOURCE_DIR) -make ../make 
 ------------------------------------------------------------------------------
-                                GNU Make 3.82
+                                 GNU Make 4.1
 ------------------------------------------------------------------------------
 
 Finding tests...
 
+features/archives ....................................... ok     (10 passed)
 features/comments ....................................... ok     (1 passed)
 features/conditionals ................................... ok     (4 passed)
 features/default_names .................................. ok     (3 passed)
-features/double_colon ................................... ok     (10 passed)
+features/double_colon ................................... ok     (11 passed)
 features/echoing ........................................ ok     (4 passed)
 features/errors ......................................... ok     (2 passed)
-features/escape ......................................... ok     (6 passed)
+features/escape ......................................... ok     (8 passed)
 features/export ......................................... ok     (12 passed)
 features/include ........................................ ok     (10 passed)
+features/jobserver ...................................... ok     (2 passed)
+features/load ........................................... ok     (5 passed)
+features/loadapi ........................................ ok     (3 passed)
 features/mult_rules ..................................... ok     (2 passed)
 features/mult_targets ................................... ok     (2 passed)
 features/order_only ..................................... ok     (10 passed)
+features/output-sync .................................... ok     (14 passed)
 features/override ....................................... ok     (4 passed)
-features/parallelism .................................... ok     (8 passed)
+features/parallelism .................................... ok     (9 passed)
 features/patspecific_vars ............................... ok     (10 passed)
 features/patternrules ................................... ok     (10 passed)
 features/quoting ........................................ ok     (1 passed)
 features/recursion ...................................... ok     (2 passed)
-features/reinvoke ....................................... ok     (4 passed)
-features/se_explicit .................................... ok     (9 passed)
-features/se_implicit .................................... ok     (9 passed)
+features/reinvoke ....................................... ok     (5 passed)
+features/rule_glob ...................................... ok     (3 passed)
+features/se_explicit .................................... ok     (10 passed)
+features/se_implicit .................................... ok     (11 passed)
 features/se_statpat ..................................... ok     (4 passed)
+features/shell_assignment ............................... ok     (4 passed)
 features/statipattrules ................................. ok     (8 passed)
-features/targetvars ..................................... ok     (23 passed)
-features/varnesting ..................................... ok     (1 passed)
+features/targetvars ..................................... ok     (25 passed)
+features/utf8 ........................................... ok     (1 passed)
+features/varnesting ..................................... ok     (2 passed)
 features/vpath .......................................... ok     (2 passed)
 features/vpath2 ......................................... ok     (1 passed)
 features/vpath3 ......................................... ok     (1 passed)
@@ -51,33 +58,38 @@
 functions/addsuffix ..................................... ok     (2 passed)
 functions/andor ......................................... ok     (2 passed)
 functions/basename ...................................... ok     (1 passed)
-functions/call .......................................... ok     (2 passed)
+functions/call .......................................... ok     (3 passed)
 functions/dir ........................................... ok     (1 passed)
 functions/error ......................................... ok     (5 passed)
 functions/eval .......................................... ok     (9 passed)
-functions/filter-out .................................... ok     (1 passed)
+functions/file .......................................... ok     (8 passed)
+functions/filter-out .................................... ok     (5 passed)
 functions/findstring .................................... ok     (1 passed)
 functions/flavor ........................................ ok     (1 passed)
 functions/foreach ....................................... ok     (4 passed)
+functions/guile ......................................... N/A
 functions/if ............................................ ok     (1 passed)
 functions/join .......................................... ok     (1 passed)
 functions/notdir ........................................ ok     (1 passed)
 functions/origin ........................................ ok     (1 passed)
 functions/realpath ...................................... ok     (2 passed)
 functions/shell ......................................... ok     (2 passed)
-functions/sort .......................................... ok     (1 passed)
+functions/sort .......................................... ok     (2 passed)
 functions/strip ......................................... ok     (2 passed)
 functions/substitution .................................. ok     (3 passed)
 functions/suffix ........................................ ok     (1 passed)
 functions/value ......................................... ok     (1 passed)
 functions/warning ....................................... ok     (4 passed)
-functions/wildcard ...................................... ok     (4 passed)
+functions/wildcard ...................................... ok     (6 passed)
 functions/word .......................................... ok     (16 passed)
-misc/close_stdout ....................................... ok     (0 passed)
+misc/bs-nl .............................................. ok     (20 passed)
+misc/close_stdout ....................................... FAILED (no tests found!)
+misc/fopen-fail ......................................... ok     (1 passed)
 misc/general1 ........................................... ok     (1 passed)
 misc/general2 ........................................... ok     (1 passed)
 misc/general3 ........................................... ok     (10 passed)
 misc/general4 ........................................... ok     (6 passed)
+misc/utf8 ............................................... ok     (1 passed)
 options/dash-B .......................................... ok     (8 passed)
 options/dash-C .......................................... ok     (2 passed)
 options/dash-I .......................................... ok     (3 passed)
@@ -86,43 +98,45 @@
 options/dash-f .......................................... ok     (4 passed)
 options/dash-k .......................................... ok     (3 passed)
 options/dash-l .......................................... ok     (1 passed)
-options/dash-n .......................................... ok     (4 passed)
-options/dash-q .......................................... ok     (8 passed)
+options/dash-n .......................................... ok     (6 passed)
+options/dash-q .......................................... ok     (10 passed)
 options/dash-t .......................................... ok     (2 passed)
-options/eval ............................................ ok     (2 passed)
+options/eval ............................................ ok     (3 passed)
 options/general ......................................... ok     (1 passed)
+options/print-directory ................................. ok     (4 passed)
 options/symlinks ........................................ ok     (10 passed)
 options/warn-undefined-variables ........................ ok     (2 passed)
 targets/DEFAULT ......................................... ok     (1 passed)
 targets/FORCE ........................................... ok     (1 passed)
 targets/INTERMEDIATE .................................... ok     (8 passed)
-targets/ONESHELL ........................................ ok     (5 passed)
+targets/ONESHELL ........................................ ok     (6 passed)
 targets/PHONY ........................................... ok     (1 passed)
-targets/POSIX ........................................... ok     (2 passed)
+targets/POSIX ........................................... ok     (4 passed)
 targets/SECONDARY ....................................... ok     (12 passed)
 targets/SILENT .......................................... ok     (1 passed)
 targets/clean ........................................... ok     (2 passed)
 variables/CURDIR ........................................ ok     (1 passed)
 variables/DEFAULT_GOAL .................................. ok     (5 passed)
+variables/GNUMAKEFLAGS .................................. ok     (3 passed)
 variables/INCLUDE_DIRS .................................. ok     (2 passed)
 variables/LIBPATTERNS ................................... ok     (2 passed)
 variables/MAKE .......................................... ok     (1 passed)
 variables/MAKECMDGOALS .................................. ok     (3 passed)
 variables/MAKEFILES ..................................... ok     (2 passed)
-variables/MAKEFLAGS ..................................... ok     (2 passed)
+variables/MAKEFLAGS ..................................... ok     (3 passed)
 variables/MAKELEVEL ..................................... ok     (1 passed)
 variables/MAKE_RESTARTS ................................. ok     (3 passed)
 variables/MFILE_LIST .................................... ok     (1 passed)
-variables/SHELL ......................................... ok     (7 passed)
+variables/SHELL ......................................... ok     (8 passed)
 variables/automatic ..................................... ok     (7 passed)
-variables/define ........................................ ok     (15 passed)
-variables/flavors ....................................... ok     (6 passed)
+variables/define ........................................ ok     (16 passed)
+variables/flavors ....................................... ok     (8 passed)
 variables/negative ...................................... ok     (4 passed)
-variables/private ....................................... ok     (8 passed)
-variables/special ....................................... ok     (2 passed)
+variables/private ....................................... ok     (10 passed)
+variables/special ....................................... ok     (5 passed)
 variables/undefine ...................................... ok     (4 passed)
 
-427 Tests in 105 Categories Complete ... No Failures :-)
+543 Tests in 118 Categories Complete ... No Failures :-)
 
 uptime
 ./loadavg
--- a/components/make/test/system-results-64.master	Mon Nov 09 09:47:32 2015 -0800
+++ b/components/make/test/system-results-64.master	Mon Nov 09 10:55:50 2015 -0800
@@ -1,35 +1,43 @@
 cd tests && perl ./run_make_tests.pl -make /usr/bin/gmake 
 ------------------------------------------------------------------------------
-                                GNU Make 3.82
+                                 GNU Make 4.1
 ------------------------------------------------------------------------------
 
 Finding tests...
 
+features/archives ....................................... ok     (10 passed)
 features/comments ....................................... ok     (1 passed)
 features/conditionals ................................... ok     (4 passed)
 features/default_names .................................. ok     (3 passed)
-features/double_colon ................................... ok     (10 passed)
+features/double_colon ................................... ok     (11 passed)
 features/echoing ........................................ ok     (4 passed)
 features/errors ......................................... ok     (2 passed)
-features/escape ......................................... ok     (6 passed)
+features/escape ......................................... ok     (8 passed)
 features/export ......................................... ok     (12 passed)
 features/include ........................................ ok     (10 passed)
+features/jobserver ...................................... ok     (2 passed)
+features/load ........................................... ok     (5 passed)
+features/loadapi ........................................ ok     (3 passed)
 features/mult_rules ..................................... ok     (2 passed)
 features/mult_targets ................................... ok     (2 passed)
 features/order_only ..................................... ok     (10 passed)
+features/output-sync .................................... ok     (14 passed)
 features/override ....................................... ok     (4 passed)
-features/parallelism .................................... ok     (8 passed)
+features/parallelism .................................... ok     (9 passed)
 features/patspecific_vars ............................... ok     (10 passed)
 features/patternrules ................................... ok     (10 passed)
 features/quoting ........................................ ok     (1 passed)
 features/recursion ...................................... ok     (2 passed)
-features/reinvoke ....................................... ok     (4 passed)
-features/se_explicit .................................... ok     (9 passed)
-features/se_implicit .................................... ok     (9 passed)
+features/reinvoke ....................................... ok     (5 passed)
+features/rule_glob ...................................... ok     (3 passed)
+features/se_explicit .................................... ok     (10 passed)
+features/se_implicit .................................... ok     (11 passed)
 features/se_statpat ..................................... ok     (4 passed)
+features/shell_assignment ............................... ok     (4 passed)
 features/statipattrules ................................. ok     (8 passed)
-features/targetvars ..................................... ok     (23 passed)
-features/varnesting ..................................... ok     (1 passed)
+features/targetvars ..................................... ok     (25 passed)
+features/utf8 ........................................... ok     (1 passed)
+features/varnesting ..................................... ok     (2 passed)
 features/vpath .......................................... ok     (2 passed)
 features/vpath2 ......................................... ok     (1 passed)
 features/vpath3 ......................................... ok     (1 passed)
@@ -40,33 +48,38 @@
 functions/addsuffix ..................................... ok     (2 passed)
 functions/andor ......................................... ok     (2 passed)
 functions/basename ...................................... ok     (1 passed)
-functions/call .......................................... ok     (2 passed)
+functions/call .......................................... ok     (3 passed)
 functions/dir ........................................... ok     (1 passed)
 functions/error ......................................... ok     (5 passed)
 functions/eval .......................................... ok     (9 passed)
-functions/filter-out .................................... ok     (1 passed)
+functions/file .......................................... ok     (8 passed)
+functions/filter-out .................................... ok     (5 passed)
 functions/findstring .................................... ok     (1 passed)
 functions/flavor ........................................ ok     (1 passed)
 functions/foreach ....................................... ok     (4 passed)
+functions/guile ......................................... N/A
 functions/if ............................................ ok     (1 passed)
 functions/join .......................................... ok     (1 passed)
 functions/notdir ........................................ ok     (1 passed)
 functions/origin ........................................ ok     (1 passed)
 functions/realpath ...................................... ok     (2 passed)
 functions/shell ......................................... ok     (2 passed)
-functions/sort .......................................... ok     (1 passed)
+functions/sort .......................................... ok     (2 passed)
 functions/strip ......................................... ok     (2 passed)
 functions/substitution .................................. ok     (3 passed)
 functions/suffix ........................................ ok     (1 passed)
 functions/value ......................................... ok     (1 passed)
 functions/warning ....................................... ok     (4 passed)
-functions/wildcard ...................................... ok     (4 passed)
+functions/wildcard ...................................... ok     (6 passed)
 functions/word .......................................... ok     (16 passed)
-misc/close_stdout ....................................... ok     (0 passed)
+misc/bs-nl .............................................. ok     (20 passed)
+misc/close_stdout ....................................... FAILED (no tests found!)
+misc/fopen-fail ......................................... ok     (1 passed)
 misc/general1 ........................................... ok     (1 passed)
 misc/general2 ........................................... ok     (1 passed)
 misc/general3 ........................................... ok     (10 passed)
 misc/general4 ........................................... ok     (6 passed)
+misc/utf8 ............................................... ok     (1 passed)
 options/dash-B .......................................... ok     (8 passed)
 options/dash-C .......................................... ok     (2 passed)
 options/dash-I .......................................... ok     (3 passed)
@@ -75,41 +88,43 @@
 options/dash-f .......................................... ok     (4 passed)
 options/dash-k .......................................... ok     (3 passed)
 options/dash-l .......................................... ok     (1 passed)
-options/dash-n .......................................... ok     (4 passed)
-options/dash-q .......................................... ok     (8 passed)
+options/dash-n .......................................... ok     (6 passed)
+options/dash-q .......................................... ok     (10 passed)
 options/dash-t .......................................... ok     (2 passed)
-options/eval ............................................ ok     (2 passed)
+options/eval ............................................ ok     (3 passed)
 options/general ......................................... ok     (1 passed)
+options/print-directory ................................. ok     (4 passed)
 options/symlinks ........................................ ok     (10 passed)
 options/warn-undefined-variables ........................ ok     (2 passed)
 targets/DEFAULT ......................................... ok     (1 passed)
 targets/FORCE ........................................... ok     (1 passed)
 targets/INTERMEDIATE .................................... ok     (8 passed)
-targets/ONESHELL ........................................ ok     (5 passed)
+targets/ONESHELL ........................................ ok     (6 passed)
 targets/PHONY ........................................... ok     (1 passed)
-targets/POSIX ........................................... ok     (2 passed)
+targets/POSIX ........................................... ok     (4 passed)
 targets/SECONDARY ....................................... ok     (12 passed)
 targets/SILENT .......................................... ok     (1 passed)
 targets/clean ........................................... ok     (2 passed)
 variables/CURDIR ........................................ ok     (1 passed)
 variables/DEFAULT_GOAL .................................. ok     (5 passed)
+variables/GNUMAKEFLAGS .................................. ok     (3 passed)
 variables/INCLUDE_DIRS .................................. ok     (2 passed)
 variables/LIBPATTERNS ................................... ok     (2 passed)
 variables/MAKE .......................................... ok     (1 passed)
 variables/MAKECMDGOALS .................................. ok     (3 passed)
 variables/MAKEFILES ..................................... ok     (2 passed)
-variables/MAKEFLAGS ..................................... ok     (2 passed)
+variables/MAKEFLAGS ..................................... ok     (3 passed)
 variables/MAKELEVEL ..................................... ok     (1 passed)
 variables/MAKE_RESTARTS ................................. ok     (3 passed)
 variables/MFILE_LIST .................................... ok     (1 passed)
-variables/SHELL ......................................... ok     (7 passed)
+variables/SHELL ......................................... ok     (8 passed)
 variables/automatic ..................................... ok     (7 passed)
-variables/define ........................................ ok     (15 passed)
-variables/flavors ....................................... ok     (6 passed)
+variables/define ........................................ ok     (16 passed)
+variables/flavors ....................................... ok     (8 passed)
 variables/negative ...................................... ok     (4 passed)
-variables/private ....................................... ok     (8 passed)
-variables/special ....................................... ok     (2 passed)
+variables/private ....................................... ok     (10 passed)
+variables/special ....................................... ok     (5 passed)
 variables/undefine ...................................... ok     (4 passed)
 
-427 Tests in 105 Categories Complete ... No Failures :-)
+543 Tests in 118 Categories Complete ... No Failures :-)