oops I'm committing when I shouldn't be

Change-Id: I99be294195c17f0399cded129f97698c5e792359

.github/workflows/apple-gdb-1824-macos.yml

@@ -98,9 +98,10 @@ jobs:
         if test -x "$(which nproc)" && test "$(nproc)" -ge 2; then \
           echo "nproc says we can use $(nproc) build jobs"; \
           if test "$(nproc)" -eq 4; then \
-            (make -j"$(nproc)" || make -j2 || make || remake -dpPw --trace=noshell); \
+            echo "special-casing the 4-job build case..."; \
+            (make -j"$(nproc)" || make -j2 || make || remake -dpPw); \
           else
-            (make -j"$(nproc)" || make || remake -dpPw --trace=command); \
+            (make -j"$(nproc)" || make || remake -dpPw --trace=read); \
           fi; \
         elif test -x "$(which gnproc)" && test "$(gnproc)" -ge 2; then \
           echo "gnproc says we can use $(gnproc) build jobs"; \

.github/workflows/codeql.yml

@@ -125,6 +125,9 @@ jobs:
           fi; \
           (bundle install && bundle check) || ruby -cwv Gemfile || ruby -c Gemfile; \
           (bundle clean && ls) || stat Gemfile || wc -l Gemfile || du Gemfile; \
+          if test -d vendor && test -r vendor && test -w vendor; then \
+            (sync && (find vendor -name '*.rb' -delete || rm -rf vendor || rmdir vendor)); \
+          fi; \
           sync && echo "leaving $(pwd)..."; \
           popd || exit; \
         elif test ${{ matrix.language }} = 'javascript-typescript' && test -x "$(which node)"; then \

libcheckpoint/Makefile_orig

@@ -55,6 +55,8 @@ $(SYMROOT)/$(LIB) : $(OBJS)
 	else \
 	  echo "no usable machocheck found; skipping running on $(SYMROOT)/$(LIB)"; \
 	fi
-	if test -x "`which size`"; then \
+	if test -x ../src/binutils/size; then \
+	  ../src/binutils/size $(SYMROOT)/$(LIB); \
+	elif test -x "`which size`"; then \
 	  size $(SYMROOT)/$(LIB); \
 	fi

macsbug/gdb_plugin_support/Makefile

@@ -180,7 +180,9 @@ $(SYMROOT)/gdb_plugin_support.o	: 	$(OBJS)
 	  if test -x "`which nm`"; then \
 	    echo "`nm gdb_plugin_support.o | wc -l` symbols in gdb_plugin_support.o"; \
 	  fi; \
-	  if test -x "`which size`"; then \
+	  if test -x ../../src/binutils/size; then \
+	    ../../src/binutils/size $(SYMROOT)/gdb_plugin_support.o; \
+	  elif test -x "`which size`"; then \
 	    size $(SYMROOT)/gdb_plugin_support.o; \
 	  fi; \
 	elif test -n "$(OBJS)"; then \

src/bfd/Makefile.am

@@ -1680,7 +1680,7 @@ bfdver.h: $(srcdir)/version.h @MAINT@ $(srcdir)/development.sh \
 	echo "$${bfd_soversion}" > libtool-soversion
 
 libtool-soversion: bfdver.h
-	stat $@ || (if test $@ -ot $<; then touch $@; fi)
+	$(AM_V_at)stat $@ || (if test $@ -ot $<; then touch $@; fi)
 
 # Disable -Werror, if it has been enabled, since coffswap.h fails
 # to compile with gcc 4.5 and above:

src/bfd/Makefile.in

@@ -10268,7 +10268,7 @@ bfdver.h: $(srcdir)/version.h @MAINT@ $(srcdir)/development.sh \
 	echo "$${bfd_soversion}" > libtool-soversion
 
 libtool-soversion: bfdver.h
-	stat $@ || (if test $@ -ot $<; then touch $@; fi)
+	$(AM_V_at)stat $@ || (if test $@ -ot $<; then touch $@; fi)
 
 # Disable -Werror, if it has been enabled, since coffswap.h fails
 # to compile with gcc 4.5 and above:

src/bfd/doc/Makefile.am

@@ -115,7 +115,7 @@ chew_am_SOURCES = $(srcdir)/chew.c $(srcdir_high)/include/ansidecl.h
 chew_am_CFLAGS = $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(H_CFLAGS)
 chew_am_LDFLAGS = -L$(srcdir_high)/intl -L../../intl $(LDFLAGS_FOR_BUILD) \
   $(WARN_LDFLAGS)
-EXTRA_chew_am_DEPENDENCIES = Makefile $(srcdir_up)/config.h
+EXTRA_chew_am_DEPENDENCIES = Makefile $(srcdir_up)/config.h chew_am-chew.o
 
 chew_am-chew.o: chew.c $(srcdir_high)/include/ansidecl.h Makefile
 	$(AM_V_at)if test -e $(srcdir)/chew_am-chew.o -a -w $(srcdir); then \
@@ -130,6 +130,8 @@ chew_am-chew.o: chew.c $(srcdir_high)/include/ansidecl.h Makefile
 	  if test -x "`which sync`"; then sync; fi; \
 	fi
 
+.NOTPARALLEL: chew_am-chew.o chew_am
+
 ## yes, I do mean to override this here, to avoid an error with libtool:
 LDFLAGS =
 ## (automake should really shut up about it...)

src/bfd/doc/Makefile.in

@@ -594,7 +594,7 @@ chew_am_CFLAGS = $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(H_CFLAGS)
 chew_am_LDFLAGS = -L$(srcdir_high)/intl -L../../intl $(LDFLAGS_FOR_BUILD) \
   $(WARN_LDFLAGS)
 
-EXTRA_chew_am_DEPENDENCIES = Makefile $(srcdir_up)/config.h
+EXTRA_chew_am_DEPENDENCIES = Makefile $(srcdir_up)/config.h chew_am-chew.o
 PATH_TO_MOVEIFCHANGE = $(srcdir_high)/move-if-change
 RUN_MOVEIFCHANGE = $(SHELL) $(PATH_TO_MOVEIFCHANGE)
 AM_CPPFLAGS = -Wp,-I.. -Wp,-I$(srcdir)/.. -Wp,-I$(srcdir_high)/include \
@@ -1199,6 +1199,8 @@ chew_am-chew.o: chew.c $(srcdir_high)/include/ansidecl.h Makefile
 	  if test -x "`which sync`"; then sync; fi; \
 	fi
 
+.NOTPARALLEL: chew_am-chew.o chew_am
+
 $(MKDOC): $(srcdir)/chew.c $(PATH_TO_MOVEIFCHANGE)
 	$(AM_V_CCLD)$(CC_FOR_BUILD) -o chew.$$$$ $(srcdir)/chew.c \
 	  $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(H_CFLAGS) \

src/libtool_gnu/Makefile.am

@@ -355,7 +355,7 @@ dist_man1_MANS		= $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1
 MAINTAINERCLEANFILES	+= $(dist_man1_MANS)
 update_mans = \
   PATH=".$(PATH_SEPARATOR)$${PATH}"; export PATH; \
-  $(HELP2MAN) --output=$@
+  $(HELP2MAN) $(NO_DISCARD_STDERR) --output=$@
 $(srcdir)/doc/libtool.1: $(srcdir)/$(auxdir)/ltmain.sh
 	$(update_mans) --help-option=--help-all libtool
 $(srcdir)/doc/libtoolize.1: $(srcdir)/libtoolize.in

src/libtool_gnu/Makefile.in

@@ -697,13 +697,15 @@ LTLIBOBJS = @LTLIBOBJS@
 LT_CONFIG_H = @LT_CONFIG_H@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
+M4 = @M4@
 M4SH = @M4SH@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NO_DISCARD_STDERR = @NO_DISCARD_STDERR@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 ORDER = @ORDER@
@@ -964,7 +966,7 @@ doc_libtool_TEXINFOS = doc/PLATFORMS doc/fdl.texi doc/notes.texi
 dist_man1_MANS = $(srcdir)/doc/libtool.1 $(srcdir)/doc/libtoolize.1
 update_mans = \
   PATH=".$(PATH_SEPARATOR)$${PATH}"; export PATH; \
-  $(HELP2MAN) --output=$@
+  $(HELP2MAN) $(NO_DISCARD_STDERR) --output=$@
 
 
 # These are required by libtoolize and must be executable when installed.

src/libtool_gnu/aclocal.m4

@@ -14,8 +14,8 @@
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],,
-[m4_warning([this file was generated for autoconf 2.71.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.72],,
+[m4_warning([this file was generated for autoconf 2.72.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])

src/libtool_gnu/config-h.in

@@ -1,33 +1,33 @@
 /* config-h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to 1 if you have the `argz_add' function. */
+/* Define to 1 if you have the 'argz_add' function. */
 #undef HAVE_ARGZ_ADD
 
-/* Define to 1 if you have the `argz_append' function. */
+/* Define to 1 if you have the 'argz_append' function. */
 #undef HAVE_ARGZ_APPEND
 
-/* Define to 1 if you have the `argz_count' function. */
+/* Define to 1 if you have the 'argz_count' function. */
 #undef HAVE_ARGZ_COUNT
 
-/* Define to 1 if you have the `argz_create_sep' function. */
+/* Define to 1 if you have the 'argz_create_sep' function. */
 #undef HAVE_ARGZ_CREATE_SEP
 
 /* Define to 1 if you have the <argz.h> header file. */
 #undef HAVE_ARGZ_H
 
-/* Define to 1 if you have the `argz_insert' function. */
+/* Define to 1 if you have the 'argz_insert' function. */
 #undef HAVE_ARGZ_INSERT
 
-/* Define to 1 if you have the `argz_next' function. */
+/* Define to 1 if you have the 'argz_next' function. */
 #undef HAVE_ARGZ_NEXT
 
-/* Define to 1 if you have the `argz_stringify' function. */
+/* Define to 1 if you have the 'argz_stringify' function. */
 #undef HAVE_ARGZ_STRINGIFY
 
-/* Define to 1 if you have the `closedir' function. */
+/* Define to 1 if you have the 'closedir' function. */
 #undef HAVE_CLOSEDIR
 
-/* Define to 1 if you have the declaration of `cygwin_conv_path', and to 0 if
+/* Define to 1 if you have the declaration of 'cygwin_conv_path', and to 0 if
    you don't. */
 #undef HAVE_DECL_CYGWIN_CONV_PATH
 
@@ -40,7 +40,7 @@
 /* Define to 1 if you have the <dld.h> header file. */
 #undef HAVE_DLD_H
 
-/* Define to 1 if you have the `dlerror' function. */
+/* Define to 1 if you have the 'dlerror' function. */
 #undef HAVE_DLERROR
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
@@ -52,7 +52,7 @@
 /* Define if you have the _dyld_func_lookup function. */
 #undef HAVE_DYLD
 
-/* Define to 1 if the system has the type `error_t'. */
+/* Define to 1 if the system has the type 'error_t'. */
 #undef HAVE_ERROR_T
 
 /* Define to 1 if you have the <inttypes.h> header file. */
@@ -67,13 +67,13 @@
 /* Define to 1 if you have the <mach-o/dyld.h> header file. */
 #undef HAVE_MACH_O_DYLD_H
 
-/* Define to 1 if you have the `opendir' function. */
+/* Define to 1 if you have the 'opendir' function. */
 #undef HAVE_OPENDIR
 
 /* Define if libtool can extract symbol lists from object files. */
 #undef HAVE_PRELOADED_SYMBOLS
 
-/* Define to 1 if you have the `readdir' function. */
+/* Define to 1 if you have the 'readdir' function. */
 #undef HAVE_READDIR
 
 /* Define if you have the shl_load function. */
@@ -94,10 +94,10 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strlcat' function. */
+/* Define to 1 if you have the 'strlcat' function. */
 #undef HAVE_STRLCAT
 
-/* Define to 1 if you have the `strlcpy' function. */
+/* Define to 1 if you have the 'strlcpy' function. */
 #undef HAVE_STRLCPY
 
 /* Define to 1 if you have the <sys/dl.h> header file. */
@@ -165,7 +165,7 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
    required in a freestanding environment). This macro is provided for
    backward compatibility; new code need not use it. */
 #undef STDC_HEADERS