Update.

2000-08-01  Mark Kettenis  <kettenis@gnu.org>

	* sysdeps/unix/sysv/linux/i386/sys/elf.h (elf_greg_t, ELF_NGREG,
	elf_gregset_t, elf_fpregset_t, elf_fpxregset_t): Moved to
	sysdeps/unix/sysv/linux/i386/sys/procfs.h.
	Remove the junk that's only relevant in the Linux kernel itself.
	Add a warning saying that this file is now obsolete, and include
	<sys/procfs.h>.
	* sysdeps/unix/sysv/linux/i386/sys/procfs.h (elf_greg_t,
	ELF_NGREG, elf_gregset_t, elf_fpregset_t, elf_fpxregset_t): Moved
	here from sysdeps/unix/sysv/linux/i386/sys/elf.h.  Don't include
	<signal.h>, <sys/ucontext.h> and <sys/elf.h>.  Remove parts of
	`struct elf_prstatus' that are #ifdef'ed out.  Improve comments
	and add the notice that the file is primarily there for GDB.
	* sysdeps/unix/sysv/linux/i386/sys/user.h: Fix comment.

2000-08-09  Jakub Jelinek  <jakub@redhat.com>

	* time/tzfile.c (__tzfile_compute): __tzstring zones
	from zone_names.

2000-08-09  Jakub Jelinek  <jakub@redhat.com>

	* resolv/resolv.h (__res_state): Surround prototype with
	__BEGIN_DECLS/__END_DECLS.
	* sysdeps/unix/sysv/linux/m68k/chown.c: Include kernel-features.h.

2000-08-04  Jes Sorensen  <jes@linuxcare.com>

	* sysdeps/unix/sysv/linux/ia64/bits/resource.h (__rlimit_resource):
	Make independant of asm/resource.h from the Linux kernel.

2000-08-06  Bruno Haible  <haible@clisp.cons.org>

	* iconv/gconv_conf.c (__gconv_read_conf): Don't call realpath.

2000-08-06  Bruno Haible  <haible@clisp.cons.org>

	* intl/Makefile (CPPFLAGS): Remove $(i18ndir) from LOCALE_ALIAS_PATH.
	* locale/Makefile (locale-CPPFLAGS): Likewise.

2000-08-09  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/i386/fpu/libm-test-ulps: Increase several error values
	for AMD processors.

2000-08-03  Jakub Jelinek  <jakub@redhat.com>

	* misc/Versions (mincore): Export at GLIBC_2.2.

2000-08-03  Bruno Haible  <haible@clisp.cons.org>

	* intl/libintl.h (gettext, dgettext, dcgettext): Add back __THROW.

14 files changed, 151 insertions, 133 deletions

diff --git a/ChangeLog b/ChangeLog
index 7848dfcbe0..989becc66d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2000-08-01  Mark Kettenis  <kettenis@gnu.org>
+
+	* sysdeps/unix/sysv/linux/i386/sys/elf.h (elf_greg_t, ELF_NGREG,
+	elf_gregset_t, elf_fpregset_t, elf_fpxregset_t): Moved to
+	sysdeps/unix/sysv/linux/i386/sys/procfs.h.
+	Remove the junk that's only relevant in the Linux kernel itself.
+	Add a warning saying that this file is now obsolete, and include
+	<sys/procfs.h>.
+	* sysdeps/unix/sysv/linux/i386/sys/procfs.h (elf_greg_t,
+	ELF_NGREG, elf_gregset_t, elf_fpregset_t, elf_fpxregset_t): Moved
+	here from sysdeps/unix/sysv/linux/i386/sys/elf.h.  Don't include
+	<signal.h>, <sys/ucontext.h> and <sys/elf.h>.  Remove parts of
+	`struct elf_prstatus' that are #ifdef'ed out.  Improve comments
+	and add the notice that the file is primarily there for GDB.
+	* sysdeps/unix/sysv/linux/i386/sys/user.h: Fix comment.
+
+2000-08-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* time/tzfile.c (__tzfile_compute): __tzstring zones
+	from zone_names.
+
+2000-08-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* resolv/resolv.h (__res_state): Surround prototype with
+	__BEGIN_DECLS/__END_DECLS.
+	* sysdeps/unix/sysv/linux/m68k/chown.c: Include kernel-features.h.
+
+2000-08-04  Jes Sorensen  <jes@linuxcare.com>
+
+	* sysdeps/unix/sysv/linux/ia64/bits/resource.h (__rlimit_resource):
+	Make independant of asm/resource.h from the Linux kernel.
+
+2000-08-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* iconv/gconv_conf.c (__gconv_read_conf): Don't call realpath.
+
+2000-08-06  Bruno Haible  <haible@clisp.cons.org>
+
+	* intl/Makefile (CPPFLAGS): Remove $(i18ndir) from LOCALE_ALIAS_PATH.
+	* locale/Makefile (locale-CPPFLAGS): Likewise.
+
+2000-08-09  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/i386/fpu/libm-test-ulps: Increase several error values
+	for AMD processors.
+
+2000-08-03  Jakub Jelinek  <jakub@redhat.com>
+
+	* misc/Versions (mincore): Export at GLIBC_2.2.
+
+2000-08-03  Bruno Haible  <haible@clisp.cons.org>
+
+	* intl/libintl.h (gettext, dgettext, dcgettext): Add back __THROW.
+
 2000-08-02  Mark Kettenis  <kettenis@gnu.org>
 
 	* sysdeps/mach/hurd/socketpair.c (__socketpair): Renamed from
@@ -29,7 +83,7 @@
 	make version.
 	(Supported Configurations): Update list of supported
 	configurations.
-	
+
 2000-08-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* locale/linereader.c (get_string): Don't print an error is a string
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 475338f7ca..6d57ca53bc 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -36,9 +36,10 @@
 /* This is the default path where we look for module lists.  */
 static const char default_gconv_path[] = GCONV_PATH;
 
-/* The path element in use.   */
+/* The path elements, as determined by the __gconv_get_path function.
+   All path elements end in a slash.  */
 const struct path_elem *__gconv_path_elem;
-/* Maximum length of a single path element.  */
+/* Maximum length of a single path element in __gconv_path_elem.  */
 size_t __gconv_max_path_elem_len;
 
 /* We use the following struct if we couldn't allocate memory.  */
@@ -507,21 +508,18 @@ __gconv_read_conf (void)
 
   for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt)
     {
-      char real_elem[__gconv_max_path_elem_len + sizeof (gconv_conf_filename)];
-
-      if (__realpath (__gconv_path_elem[cnt].name, real_elem) != NULL)
-	{
-	  size_t elem_len = strlen (real_elem);
-	  char *filename;
-
-	  filename = alloca (elem_len + 1 + sizeof (gconv_conf_filename));
-	  __mempcpy (__mempcpy (__mempcpy (filename, real_elem, elem_len),
-				"/", 1),
-		     gconv_conf_filename, sizeof (gconv_conf_filename));
-
-	  /* Read the next configuration file.  */
-	  read_conf_file (filename, real_elem, elem_len, &modules, &nmodules);
-	}
+      const char *elem = __gconv_path_elem[cnt].name;
+      size_t elem_len = __gconv_path_elem[cnt].len;
+      char *filename;
+
+      /* No slash needs to be inserted between elem and gconv_conf_filename;
+	 elem already ends in a slash.  */
+      filename = alloca (elem_len + sizeof (gconv_conf_filename));
+      __mempcpy (__mempcpy (filename, elem, elem_len),
+		 gconv_conf_filename, sizeof (gconv_conf_filename));
+
+      /* Read the next configuration file.  */
+      read_conf_file (filename, elem, elem_len, &modules, &nmodules);
     }
 
   /* Add the internal modules.  */
diff --git a/intl/Makefile b/intl/Makefile
index f1ba8c2d95..966dad3e82 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -71,7 +71,7 @@ CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\"
 $(objpfx)tst-translit.out: $(objpfx)tst-gettext.out
 
 CPPFLAGS += -D'GNULOCALEDIR="$(msgcatdir)"' \
-	    -D'LOCALE_ALIAS_PATH="$(msgcatdir):$(i18ndir)"'
+	    -D'LOCALE_ALIAS_PATH="$(msgcatdir)"'
 YFLAGS = --name-prefix=__gettext --output
 
 $(inst_msgcatdir)/locale.alias: locale.alias $(+force)
diff --git a/intl/libintl.h b/intl/libintl.h
index e38b5619bf..eb81d7cd3a 100644
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -31,18 +31,19 @@ __BEGIN_DECLS
 /* Look up MSGID in the current default message catalog for the current
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
    text).  */
-extern char *gettext (__const char *__msgid);
+extern char *gettext (__const char *__msgid) __THROW;
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    LC_MESSAGES locale.  */
-extern char *dgettext (__const char *__domainname, __const char *__msgid);
+extern char *dgettext (__const char *__domainname, __const char *__msgid)
+     __THROW;
 extern char *__dgettext (__const char *__domainname, __const char *__msgid)
      __THROW __attribute_format_arg__ (2);
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
    locale.  */
 extern char *dcgettext (__const char *__domainname,
-			__const char *__msgid, int __category);
+			__const char *__msgid, int __category) __THROW;
 extern char *__dcgettext (__const char *__domainname,
 			  __const char *__msgid, int __category)
      __THROW __attribute_format_arg__ (2);
diff --git a/locale/Makefile b/locale/Makefile
index 5d7594a853..4bcdecbe74 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -85,7 +85,7 @@ localepath = "$(localedir):$(i18ndir)"
 
 locale-CPPFLAGS := -DLOCALE_PATH='$(localepath)' \
 		   -DLOCALEDIR='"$(localedir)"' \
-		   -DLOCALE_ALIAS_PATH='"$(msgcatdir):$(i18ndir)"' \
+		   -DLOCALE_ALIAS_PATH='"$(msgcatdir)"' \
 		   -DCHARMAP_PATH='"$(i18ndir)/charmaps"' \
 		   -DREPERTOIREMAP_PATH='"$(i18ndir)/repertoiremaps"' \
 		   -DLOCSRCDIR='"$(i18ndir)/locales"' -DHAVE_CONFIG_H \
diff --git a/misc/Versions b/misc/Versions
index d66f9ec26f..0e32c23c9e 100644
--- a/misc/Versions
+++ b/misc/Versions
@@ -107,7 +107,7 @@ libc {
     getloadavg;
 
     # m*
-    mkdtemp;
+    mincore; mkdtemp;
 
     # p*
     posix_madvise;
diff --git a/resolv/resolv.h b/resolv/resolv.h
index 74a55ef0fb..6677adde3b 100644
--- a/resolv/resolv.h
+++ b/resolv/resolv.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1983, 1987, 1989
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -216,7 +216,9 @@ typedef struct __res_state *res_state;
 
 /* Things involving an internal (static) resolver context. */
 #if !defined _LIBC || defined _LIBC_REENTRANT
+__BEGIN_DECLS
 extern struct __res_state *__res_state(void) __attribute__ ((__const__));
+__END_DECLS
 #define _res (*__res_state())
 #else
 #ifndef __BIND_NOSTATIC
@@ -259,7 +261,7 @@ __END_DECLS
 #if !defined(SHARED_LIBBIND) || defined(LIB)
 /*
  * If libbind is a shared object (well, DLL anyway)
- * these externs break the linker when resolv.h is 
+ * these externs break the linker when resolv.h is
  * included by a lib client (like named)
  * Make them go away if a client is including this
  *
diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
index 83bdcbf1a1..99882f2ff5 100644
--- a/sysdeps/i386/fpu/libm-test-ulps
+++ b/sysdeps/i386/fpu/libm-test-ulps
@@ -2,8 +2,13 @@
 
 # acos
 Test "acos (0.7) == 0.7953988301841435554":
-ildouble: 1149
-ldouble: 1149
+ildouble: 1150
+ldouble: 1150
+
+# acosh
+Test "acosh (7) == 2.6339157938496334172":
+ldouble: 1
+ildouble: 1
 
 # asin
 Test "asin (0.7) == 0.7753974966107530637":
@@ -166,8 +171,8 @@ double: 2
 float: 1
 idouble: 2
 ifloat: 1
-ildouble: 2
-ldouble: 2
+ildouble: 6
+ldouble: 6
 Test "Imaginary part of: catanh (-2 - 3 i) == -0.1469466662255297520 - 1.3389725222944935611 i":
 Test "Real part of: catanh (0.7 + 1.2 i) == 0.2600749516525135959 + 0.9702403077950989849 i":
 double: 1
@@ -332,8 +337,8 @@ double: 2
 float: 1
 idouble: 2
 ifloat: 1
-ildouble: 1402
-ldouble: 1402
+ildouble: 1403
+ldouble: 1403
 Test "Imaginary part of: clog10 (0.7 + 1.2 i) == 0.1427786545038868803 + 0.4528483579352493248 i":
 double: 1
 idouble: 1
@@ -404,8 +409,8 @@ ifloat: 4
 Test "Imaginary part of: cpow (2 + 3 i, 4 + 0 i) == -119.0 - 120.0 i":
 float: 1
 ifloat: 1
-ildouble: 2
-ldouble: 2
+ildouble: 4
+ldouble: 4
 Test "Real part of: cpow (e + 0 i, 0 + 2 * M_PIl i) == 1.0 + 0.0 i":
 Test "Imaginary part of: cpow (e + 0 i, 0 + 2 * M_PIl i) == 1.0 + 0.0 i":
 double: 1.104
diff --git a/sysdeps/unix/sysv/linux/i386/sys/elf.h b/sysdeps/unix/sysv/linux/i386/sys/elf.h
index 1590ec5186..f9ed51e803 100644
--- a/sysdeps/unix/sysv/linux/i386/sys/elf.h
+++ b/sysdeps/unix/sysv/linux/i386/sys/elf.h
@@ -19,43 +19,8 @@
 #ifndef _SYS_ELF_H
 #define _SYS_ELF_H	1
 
-/*
- * ELF register definitions..
- */
+#warning "This header is obsolete; use <sys/procfs.h> instead."
 
-#include <sys/user.h>
-
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t))
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-
-typedef struct user_fpregs_struct elf_fpregset_t;
-typedef struct user_fpxregs_struct elf_fpxregset_t;
-
-#define USE_ELF_CORE_DUMP
-#define ELF_EXEC_PAGESIZE	4096
-
-/* regs is struct pt_regs, pr_reg is elf_gregset_t (which is
-   now struct_user_regs, they are different) */
-
-#define ELF_CORE_COPY_REGS(pr_reg, regs)		\
-	pr_reg[0] = regs->ebx;				\
-	pr_reg[1] = regs->ecx;				\
-	pr_reg[2] = regs->edx;				\
-	pr_reg[3] = regs->esi;				\
-	pr_reg[4] = regs->edi;				\
-	pr_reg[5] = regs->ebp;				\
-	pr_reg[6] = regs->eax;				\
-	pr_reg[7] = regs->xds;				\
-	pr_reg[8] = regs->xes;				\
-	pr_reg[9] = regs->xds;				\
-	pr_reg[10] = regs->xds;				\
-	pr_reg[11] = regs->orig_eax;			\
-	pr_reg[12] = regs->eip;				\
-	pr_reg[13] = regs->xcs;				\
-	pr_reg[14] = regs->eflags;			\
-	pr_reg[15] = regs->esp;				\
-	pr_reg[16] = regs->xss;
+#include <sys/procfs.h>
 
 #endif	/* _SYS_ELF_H */
diff --git a/sysdeps/unix/sysv/linux/i386/sys/procfs.h b/sysdeps/unix/sysv/linux/i386/sys/procfs.h
index 0ba50dcc31..d522c51b00 100644
--- a/sysdeps/unix/sysv/linux/i386/sys/procfs.h
+++ b/sysdeps/unix/sysv/linux/i386/sys/procfs.h
@@ -19,20 +19,42 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somewhat modelled after the file of the same name on SVR4
    systems.  It provides a definition of the core file format for ELF
-   used on Linux.  */
+   used on Linux.  It doesn't have anything to do with the /proc file
+   system, even though Linux has one.
+
+   Anyway, the whole purpose of this file is for GDB and GDB only.
+   Don't read too much into it.  Don't use it for anything other than
+   GDB unless you know what you are doing.  */
 
 #include <features.h>
-#include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <sys/ucontext.h>
 #include <sys/user.h>
-#include <sys/elf.h>
 
 __BEGIN_DECLS
 
+/* Type for a general-purpose register.  */
+typedef unsigned long elf_greg_t;
+
+/* And the whole bunch of them.  We could have used `struct
+   user_regs_struct' directly in the typedef, but tradition says that
+   the register set is an array, which does have some peculiar
+   semantics, so leave it that way.  */
+#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t))
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+
+/* Register set for the floating-point registers.  */
+typedef struct user_fpregs_struct elf_fpregset_t;
+
+/* Register set for the extended floating-point registers.  Includes
+   the Pentium III SSE registers in addition to the classic
+   floating-point stuff.  */
+typedef struct user_fpxregs_struct elf_fpxregset_t;
+
+
+/* Signal info.  */
 struct elf_siginfo
   {
     int si_signo;			/* Signal number.  */
@@ -43,26 +65,17 @@ struct elf_siginfo
 
 /* Definitions to generate Intel SVR4-like core files.  These mostly
    have the same names as the SVR4 types with "elf_" tacked on the
-   front to prevent clashes with linux definitions, and the typedef
+   front to prevent clashes with Linux definitions, and the typedef
    forms have been avoided.  This is mostly like the SVR4 structure,
    but more Linuxy, with things that Linux does not support and which
-   gdb doesn't really use excluded.  Fields present but not used are
-   marked with "XXX".  */
+   GDB doesn't really use excluded.  */
+
 struct elf_prstatus
   {
-#if 0
-    long int pr_flags;			/* XXX Process flags.  */
-    short int pr_why;			/* XXX Reason for process halt.  */
-    short int pr_what;			/* XXX More detailed reason.  */
-#endif
     struct elf_siginfo pr_info;		/* Info associated with signal.  */
     short int pr_cursig;		/* Current signal.  */
     unsigned long int pr_sigpend;	/* Set of pending signals.  */
     unsigned long int pr_sighold;	/* Set of held signals.  */
-#if 0
-    struct sigaltstack pr_altstack;	/* Alternate stack info.  */
-    struct sigaction pr_action;		/* Signal action for current sig.  */
-#endif
     __pid_t pr_pid;
     __pid_t pr_ppid;
     __pid_t pr_pgrp;
@@ -71,15 +84,12 @@ struct elf_prstatus
     struct timeval pr_stime;		/* System time.  */
     struct timeval pr_cutime;		/* Cumulative user time.  */
     struct timeval pr_cstime;		/* Cumulative system time.  */
-#if 0
-    long int pr_instr;			/* Current instruction.  */
-#endif
     elf_gregset_t pr_reg;		/* GP registers.  */
     int pr_fpvalid;			/* True if math copro being used.  */
   };
 
 
-#define ELF_PRARGSZ     (80)    /* Number of chars for args */
+#define ELF_PRARGSZ     (80)    /* Number of chars for args.  */
 
 struct elf_prpsinfo
   {
@@ -97,6 +107,10 @@ struct elf_prpsinfo
   };
 
 
+/* The rest of this file provides the types for emulation of the
+   Solaris <proc_service.h> interfaces that should be implemented by
+   users of libthread_db.  */
+
 /* Addresses.  */
 typedef void *psaddr_t;
 
@@ -105,10 +119,10 @@ typedef elf_gregset_t prgregset_t;
 typedef elf_fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
-   therefore habe only ine PID type.  */
+   therefore have only one PID type.  */
 typedef __pid_t lwpid_t;
 
-
+/* Process status and info.  In the end we do provide typedefs for them.  */
 typedef struct elf_prstatus prstatus_t;
 typedef struct elf_prpsinfo prpsinfo_t;
 
diff --git a/sysdeps/unix/sysv/linux/i386/sys/user.h b/sysdeps/unix/sysv/linux/i386/sys/user.h
index 884402a6de..d57dc174cd 100644
--- a/sysdeps/unix/sysv/linux/i386/sys/user.h
+++ b/sysdeps/unix/sysv/linux/i386/sys/user.h
@@ -19,9 +19,9 @@
 #ifndef _SYS_USER_H
 #define _SYS_USER_H	1
 
-/* The whole purpose of this file is for gdb and gdb only. Don't read
-   too much into it. Don't use it for anything other than gdb unless
-   you know what you are doing. */
+/* The whole purpose of this file is for GDB and GDB only.  Don't read
+   too much into it.  Don't use it for anything other than GDB unless
+   you know what you are doing.  */
 
 struct user_fpregs_struct
 {
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/resource.h b/sysdeps/unix/sysv/linux/ia64/bits/resource.h
index 877499765d..f9c454b0fb 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/resource.h
@@ -32,73 +32,51 @@
 enum __rlimit_resource
 {
   /* Per-process CPU limit, in seconds.  */
-  _RLIMIT_CPU = RLIMIT_CPU,
-#undef RLIMIT_CPU
-  RLIMIT_CPU = _RLIMIT_CPU,
+  RLIMIT_CPU = 0,
 #define RLIMIT_CPU RLIMIT_CPU
 
   /* Largest file that can be created, in bytes.  */
-  _RLIMIT_FSIZE = RLIMIT_FSIZE,
-#undef RLIMIT_FSIZE
-  RLIMIT_FSIZE = _RLIMIT_FSIZE,
+  RLIMIT_FSIZE = 1,
 #define	RLIMIT_FSIZE RLIMIT_FSIZE
 
   /* Maximum size of data segment, in bytes.  */
-  _RLIMIT_DATA = RLIMIT_DATA,
-#undef RLIMIT_DATA
-  RLIMIT_DATA = _RLIMIT_DATA,
+  RLIMIT_DATA = 2,
 #define	RLIMIT_DATA RLIMIT_DATA
 
   /* Maximum size of stack segment, in bytes.  */
-  _RLIMIT_STACK = RLIMIT_STACK,
-#undef RLIMIT_STACK
-  RLIMIT_STACK = _RLIMIT_STACK,
+  RLIMIT_STACK = 3,
 #define	RLIMIT_STACK RLIMIT_STACK
 
   /* Largest core file that can be created, in bytes.  */
-  _RLIMIT_CORE = RLIMIT_CORE,
-#undef RLIMIT_CORE
-  RLIMIT_CORE = _RLIMIT_CORE,
+  RLIMIT_CORE = 4,
 #define	RLIMIT_CORE RLIMIT_CORE
 
   /* Largest resident set size, in bytes.
      This affects swapping; processes that are exceeding their
      resident set size will be more likely to have physical memory
      taken from them.  */
-  _RLIMIT_RSS = RLIMIT_RSS,
-#undef RLIMIT_RSS
-  RLIMIT_RSS = _RLIMIT_RSS,
+  RLIMIT_RSS = 5,
 #define	RLIMIT_RSS RLIMIT_RSS
 
   /* Number of processes.  */
-  _RLIMIT_NPROC = RLIMIT_NPROC,
-#undef RLIMIT_NPROC
-  RLIMIT_NPROC = _RLIMIT_NPROC,
+  RLIMIT_NPROC = 6,
 #define RLIMIT_NPROC RLIMIT_NPROC
 
   /* Number of open files.  */
-  _RLIMIT_NOFILE = RLIMIT_NOFILE,
-#undef RLIMIT_NOFILE
-  RLIMIT_NOFILE = _RLIMIT_NOFILE,
+  RLIMIT_NOFILE = 7,
   RLIMIT_OFILE = RLIMIT_NOFILE, /* BSD name for same.  */
 #define RLIMIT_NOFILE RLIMIT_NOFILE
 #define RLIMIT_OFILE RLIMIT_OFILE
 
   /* Locked-in-memory address space.  */
-  _RLIMIT_MEMLOCK = RLIMIT_MEMLOCK,
-#undef RLIMIT_MEMLOCK
-  RLIMIT_MEMLOCK = _RLIMIT_MEMLOCK,
+  RLIMIT_MEMLOCK = 8,
 #define RLIMIT_MEMLOCK RLIMIT_MEMLOCK
 
   /* Address space limit (?) */
-  _RLIMIT_AS = RLIMIT_AS,
-#undef RLIMIT_AS
-  RLIMIT_AS = _RLIMIT_AS,
+  RLIMIT_AS = 9,
 #define RLIMIT_AS RLIMIT_AS
 
-  RLIMIT_NLIMITS = RLIM_NLIMITS,
-#undef RLIM_NLIMITS
-  RLIM_NLIMITS = RLIMIT_NLIMITS
+  RLIM_NLIMITS = 10
 #define RLIMIT_NLIMITS RLIMIT_NLIMITS
 #define RLIM_NLIMITS RLIM_NLIMITS
 };
diff --git a/sysdeps/unix/sysv/linux/m68k/chown.c b/sysdeps/unix/sysv/linux/m68k/chown.c
index e97c14834e..1ea7e264c9 100644
--- a/sysdeps/unix/sysv/linux/m68k/chown.c
+++ b/sysdeps/unix/sysv/linux/m68k/chown.c
@@ -24,6 +24,7 @@
 #include <bp-checks.h>
 
 #include <linux/posix_types.h>
+#include "kernel-features.h"
 
 extern int __syscall_chown (const char *__unbounded __file,
 			    __kernel_uid_t __owner, __kernel_gid_t __group);
@@ -42,7 +43,7 @@ extern int __libc_missing_32bit_uids;
 int
 __chown (const char *file, uid_t owner, gid_t group)
 {
-#if __ASSUME_32BITUIDS
+#if __ASSUME_32BITUIDS > 0
   return INLINE_SYSCALL (chown32, 3, CHECK_STRING (file), owner, group);
 #else
 # ifdef __NR_chown32
diff --git a/time/tzfile.c b/time/tzfile.c
index 6681f9a66c..a2974033d4 100644
--- a/time/tzfile.c
+++ b/time/tzfile.c
@@ -498,7 +498,7 @@ __tzfile_compute (time_t timer, int use_localtime,
 	/* There is no daylight saving time.  */
 	__tzname[1] = __tzname[0];
       tp->tm_isdst = info->isdst;
-      tp->tm_zone = &zone_names[info->idx];
+      tp->tm_zone = __tzstring (&zone_names[info->idx]);
       tp->tm_gmtoff = info->offset;
     }