* sysdeps/libm-i387/s_finite.S: Use %eax instead of %al in setnel insn.

	* intl/l10nflist.c: Fix conditional on #include <argz.h>.

	* libio/stdio.h (FOPEN_MAX, FILENAME_MAX, TMP_MAX, L_tmpnam): Macros
	removed.  Instead, include <stdio_lim.h>.

	* libio/_G_config.h: New file.
	* libio/Makefile (headers): Add _G_config.h.

	* MakeTAGS (po/errlist.pot): Extract from sysdeps/gnu/errlist.c.

9 files changed, 57 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 678bc1ef37..437648e4d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 Tue Jun  4 02:25:44 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* sysdeps/libm-i387/s_finite.S: Use %eax instead of %al in setnel insn.
+
+	* intl/l10nflist.c: Fix conditional on #include <argz.h>.
+
+	* libio/stdio.h (FOPEN_MAX, FILENAME_MAX, TMP_MAX, L_tmpnam): Macros
+	removed.  Instead, include <stdio_lim.h>.
+
+	* libio/_G_config.h: New file.
+	* libio/Makefile (headers): Add _G_config.h.
+
+	* MakeTAGS (po/errlist.pot): Extract from sysdeps/gnu/errlist.c.
+
 	* sysdeps/unix/sysv/linux/gnu/types.h (__KERNEL_STRICT_NAMES): Define
 	this macro too; current Linux kernels test that instead of
 	_LINUX_TYPES_DONT_EXPORT.
diff --git a/MakeTAGS b/MakeTAGS
index 7e95c266e1..e346ac7a1a 100644
--- a/MakeTAGS
+++ b/MakeTAGS
@@ -145,7 +145,7 @@ else
 endif
 
 $P/siglist.pot: $(common-objpfx)siglist.c; $(extract)
-$P/errlist.pot: $(..)sysdeps/mach/hurd/errlist.c; $(extract)
+$P/errlist.pot: $(..)sysdeps/gnu/errlist.c; $(extract)
 
 # Extract all strings from these files; their strings are not marked.
 # Their surroundings are also not interesting.
diff --git a/intl/dcgettext.c b/intl/dcgettext.c
index 743c85bf22..ba3796d5e0 100644
--- a/intl/dcgettext.c
+++ b/intl/dcgettext.c
@@ -27,6 +27,7 @@ Cambridge, MA 02139, USA.  */
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
 #else
 # if defined HAVE_ALLOCA_H || defined _LIBC
 #  include <alloca.h>
@@ -162,10 +163,6 @@ static const char *guess_category_value PARAMS ((int category,
 						 const char *categoryname));
 
 
-#ifdef _LIBC
-#define HAVE_ALLOCA 1
-#endif
-
 /* For those loosing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
diff --git a/intl/l10nflist.c b/intl/l10nflist.c
index 00e3c8950a..798728c3b1 100644
--- a/intl/l10nflist.c
+++ b/intl/l10nflist.c
@@ -19,7 +19,7 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#if defined _LIBC && (defined __ARGZ_COUNT || defined __ARGZ_STRINGIFY)
+#if defined _LIBC || (defined __ARGZ_COUNT && defined __ARGZ_STRINGIFY)
 # include <argz.h>
 #endif
 #include <ctype.h>
diff --git a/intl/localealias.c b/intl/localealias.c
index 8ecbfcb7a4..b30a9e5bf5 100644
--- a/intl/localealias.c
+++ b/intl/localealias.c
@@ -29,6 +29,7 @@ Cambridge, MA 02139, USA.  */
 
 #ifdef __GNUC__
 # define alloca __builtin_alloca
+# define HAVE_ALLOCA 1
 #else
 # if defined HAVE_ALLOCA_H || defined _LIBC
 #  include <alloca.h>
@@ -78,10 +79,6 @@ void free ();
 #endif
 
 
-#ifdef _LIBC
-#define HAVE_ALLOCA 1
-#endif
-
 /* For those loosing systems which don't have `alloca' we have to add
    some additional code emulating it.  */
 #ifdef HAVE_ALLOCA
diff --git a/libio/Makefile b/libio/Makefile
index 02426a79c2..e4df6b545e 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1995 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
 #
 subdir	:= libio
 
-headers	:= stdio.h libio.h
+headers	:= stdio.h libio.h _G_config.h
 
 routines	:=							      \
 	filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen      \
diff --git a/libio/_G_config.h b/libio/_G_config.h
new file mode 100644
index 0000000000..5340055fc7
--- /dev/null
+++ b/libio/_G_config.h
@@ -0,0 +1,37 @@
+/* This file is needed by libio to define various configuration parameters.
+   These are always the same in the GNU C library.  */
+
+#ifndef _G_config_h
+#define _G_config_h 1
+
+/* Define types for libio in terms of the standard internal type names.  */
+
+#include <gnu/types.h>
+#define __need_size_t
+#include <stddef.h>
+#define _G_size_t	size_t
+#define _G_fpos_t	__off_t
+#define _G_ssize_t	__ssize_t
+#define _G_off_t	__off_t
+#define	_G_pid_t	__pid_t
+#define	_G_uid_t	__uid_t
+
+
+/* These library features are always available in the GNU C library.  */
+#define _G_HAVE_ATEXIT 1
+#define _G_HAVE_SYS_WAIT 1
+#define _G_NEED_STDARG_H 1
+#define _G_va_list __gnuc_va_list
+
+/* This is defined by <statbuf.h> if `st_blksize' exists.  */
+#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
+
+#define _G_BUFSIZ 8192
+
+/* These are the vtbl details for ELF.  */
+#define _G_NAMES_HAVE_UNDERSCORE 0
+#define _G_VTABLE_LABEL_PREFIX "_vt."
+#define _G_VTABLE_LABEL_HAS_LENGTH 1
+
+
+#endif	/* _G_config.h */
diff --git a/libio/stdio.h b/libio/stdio.h
index a1766cea33..e2670c9fba 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -71,12 +71,9 @@ typedef _IO_size_t size_t;
 typedef struct _IO_FILE FILE;
 typedef _IO_fpos_t fpos_t;
 
-#define FOPEN_MAX     _G_FOPEN_MAX
-#define FILENAME_MAX _G_FILENAME_MAX
-#define TMP_MAX 999 /* Only limited by filename length */
+#include <stdio_lim.h>
 
 #define P_tmpdir      "/tmp"
-#define L_tmpnam      20
 
 /* For use by debuggers. These are linked in if printf or fprintf are used. */
 extern FILE *stdin, *stdout, *stderr; /* TODO */
diff --git a/sysdeps/libm-i387/s_finite.S b/sysdeps/libm-i387/s_finite.S
index a65aa6a1e8..aa01c5ee45 100644
--- a/sysdeps/libm-i387/s_finite.S
+++ b/sysdeps/libm-i387/s_finite.S
@@ -11,7 +11,7 @@ ENTRY(__finite)
 	movl	8(%esp),%eax
 	andl	$0x7ff00000, %eax
 	cmpl	$0x7ff00000, %eax
-	setnel	%al
+	setnel	%eax
 	andl	$0x000000ff, %eax
 	ret
 weak_alias (__finite, finite)