Regenerated for 3.74

[_AIX] (LOAD_AVE_TYPE, FSCALE, NLIST_STRUCT): Define these for AIX.
(getloadavg) [_AIX]: Use `knlist' instead of `nlist'.

Makefile.in

@@ -216,6 +216,7 @@ $(infodir)/make.info: make.info
 # We use `$(SHELL) -c' because some shells do not
 # fail gracefully when there is an unknown command.
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
 	  install-info --infodir=$(infodir) $$dir/make.info; \
 	else true; fi
 

README

@@ -1,4 +1,4 @@
-This directory contains the 3.73.2 test release of GNU Make.
+This directory contains the 3.74 test release of GNU Make.
 All bugs reported for previous test releases have been fixed.
 Some bugs surely remain.
 

compatMakefile

@@ -216,6 +216,7 @@ $(infodir)/make.info: make.info
 # We use `$(SHELL) -c' because some shells do not
 # fail gracefully when there is an unknown command.
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+	  if [ -r ./make.info ]; then dir=.; else dir=$(srcdir); fi; \
 	  install-info --infodir=$(infodir) $$dir/make.info; \
 	else true; fi
 

file.c

@@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "dep.h"
 #include "file.h"
 #include "variable.h"
+#include <assert.h>
 
 
 /* Hash table of files the makefile knows how to make.  */
@@ -497,6 +498,10 @@ print_file (f)
 	  puts ("#  Successfully updated.");
 	  break;
 	case 1:
+	  assert (question_flag);
+	  puts ("#  Needs to be updated (-q is set).");
+	  break;
+	case 2:
 	  puts ("#  Failed to be updated.");
 	  break;
 	default:

getloadavg.c

@@ -210,6 +210,10 @@ extern int errno;
 #define LOAD_AVE_TYPE long
 #endif
 
+#ifdef _AIX
+#define LOAD_AVE_TYPE long
+#endif
+
 #endif /* No LOAD_AVE_TYPE.  */
 
 #ifdef OSF_ALPHA
@@ -254,6 +258,10 @@ extern int errno;
 #define FSCALE 100.0
 #endif
 
+#ifdef _AIX
+#define FSCALE 65536.0
+#endif
+
 #endif	/* Not FSCALE.  */
 
 #if !defined (LDAV_CVT) && defined (FSCALE)
@@ -315,6 +323,10 @@ extern int errno;
 #define NLIST_STRUCT
 #endif
 
+#ifdef _AIX
+#define NLIST_STRUCT
+#endif
+
 #endif /* defined (NLIST_STRUCT) */
 
 
@@ -340,7 +352,7 @@ extern int errno;
 #define LDAV_SYMBOL "_Loadavg"
 #endif
 
-#if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)))
+#if !defined(LDAV_SYMBOL) && ((defined(hpux) && !defined(hp9000s300)) || defined(_SEQUENT_) || defined(SVR4) || defined(ISC) || defined(sgi) || (defined (ardent) && defined (titan)) || defined (_AIX))
 #define LDAV_SYMBOL "avenrun"
 #endif
 
@@ -790,23 +802,29 @@ getloadavg (loadavg, nelem)
 #endif /* NLIST_STRUCT */
 
 #ifndef SUNOS_5
-      if (nlist (KERNEL_FILE, nl) >= 0)
+      if (
-	/* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
+#ifndef _AIX
-	{
+	  nlist (KERNEL_FILE, nl)
-#ifdef FIXUP_KERNEL_SYMBOL_ADDR
+#else  /* _AIX */
-	  FIXUP_KERNEL_SYMBOL_ADDR (nl);
+	  knlist (nl, 1, sizeof (nl[0]))
 #endif
-	  offset = nl[0].n_value;
+	  >= 0)
-	}
+	  /* Omit "&& nl[0].n_type != 0 " -- it breaks on Sun386i.  */
-#endif  /* !SUNOS_5 */
+	  {
-#else /* sgi */
+#ifdef FIXUP_KERNEL_SYMBOL_ADDR
-      int ldav_off;
+	    FIXUP_KERNEL_SYMBOL_ADDR (nl);
+#endif
+	    offset = nl[0].n_value;
+	  }
+#endif /* !SUNOS_5 */
+#else  /* sgi */
+	  int ldav_off;
 
-      ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
+	  ldav_off = sysmp (MP_KERNADDR, MPKA_AVENRUN);
-      if (ldav_off != -1)
+	  if (ldav_off != -1)
-	offset = (long) ldav_off & 0x7fffffff;
+	  offset = (long) ldav_off & 0x7fffffff;
 #endif /* sgi */
-    }
+	}
 
   /* Make sure we have /dev/kmem open.  */
   if (!getloadavg_initialized)

glob/ChangeLog

@@ -1,3 +1,7 @@
+Sat Apr 29 15:46:57 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* posix/glob.c (S_ISDIR): Define if undefined.
+
 Tue Apr 25 17:17:19 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* posix/glob.c (glob): If GLOB_MARK set, stat names to find

glob/glob.c

@@ -181,6 +181,8 @@ extern char *alloca ();
 #endif
 #ifdef STAT_MACROS_BROKEN
 #undef S_ISDIR
+#endif
+#ifndef S_ISDIR
 #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
 #endif

signame.c

@@ -15,14 +15,14 @@ You should have received a copy of the GNU General Public License
 along with this program; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include <stdio.h>
-#include <sys/types.h>		/* Some systems need this for <signal.h>.  */
-#include <signal.h>
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
+#include <stdio.h>
+#include <sys/types.h>		/* Some systems need this for <signal.h>.  */
+#include <signal.h>
+
 /* Some systems declare `sys_siglist in <unistd.h>; if
    configure defined SYS_SIGLIST_DECLARED, it may expect
    to find the declaration there.  */

version.c

@@ -1,4 +1,4 @@
-char *version_string = "3.73.2";
+char *version_string = "3.74";
 
 /*
   Local variables: