* shlib-versions: Match alpha*. * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add adjtimex. * sysdeps/unix/sysv/linux/alpha/adjtimex.S: Remove. * sysdeps/alpha/fpu/bits/mathinline.h (isunordered et al): New. Implement copysign* with and without __ prefix. Likewise for fabs; use builtin for gcc 2.8. (floor*): New. (fdim*): New. * elf/elf.h (EF_SPARC*, EF_ALPHA*, SHT_ALPHA*, SHF_ALPHA*): New. (R_SPARC*): Match current v9 ABI. * sysdeps/wordsize-64/stdint.h (intptr_t): Is a long. * sunrpc/clnt_udp.c (clntudp_call): Use socklen_t. * sunrpc/pmap_rmt.c (clnt_broadcast): Likewise. * sunrpc/svc_tcp.c (svctcp_create, rendezvous_request): Likewise. * sysdeps/generic/getresgid.c: Use prototype form because of warning. * sysdeps/unix/sysv/linux/getdents.c: Likewise. * sysdeps/unix/sysv/linux/alpha/adjtime.c: Likewise. * sysdeps/unix/grantpt.c (argv): Fix consts. * sysdeps/unix/sysv/linux/getpt.c: Include <string.h> * sysdeps/unix/sysv/linux/sigaction.c: Likewise.

1998-03-01  Richard Henderson  <rth@cygnus.com>

	* shlib-versions: Match alpha*.
	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Add adjtimex.
	* sysdeps/unix/sysv/linux/alpha/adjtimex.S: Remove.

	* sysdeps/alpha/fpu/bits/mathinline.h (isunordered et al): New.
	Implement copysign* with and without __ prefix.
	Likewise for fabs; use builtin for gcc 2.8.
	(floor*): New.
	(fdim*): New.

	* elf/elf.h (EF_SPARC*, EF_ALPHA*, SHT_ALPHA*, SHF_ALPHA*): New.
	(R_SPARC*): Match current v9 ABI.

	* sysdeps/wordsize-64/stdint.h (intptr_t): Is a long.

	* sunrpc/clnt_udp.c (clntudp_call): Use socklen_t.
	* sunrpc/pmap_rmt.c (clnt_broadcast): Likewise.
	* sunrpc/svc_tcp.c (svctcp_create, rendezvous_request): Likewise.
	* sysdeps/generic/getresgid.c: Use prototype form because of warning.
	* sysdeps/unix/sysv/linux/getdents.c: Likewise.
	* sysdeps/unix/sysv/linux/alpha/adjtime.c: Likewise.
	* sysdeps/unix/grantpt.c (argv): Fix consts.
	* sysdeps/unix/sysv/linux/getpt.c: Include <string.h>
	* sysdeps/unix/sysv/linux/sigaction.c: Likewise.

17 files changed, 223 insertions, 105 deletions

diff --git a/ChangeLog b/ChangeLog
index c5e8ff3..e03023d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+1998-03-01  Richard Henderson  <rth@cygnus.com>
+
+	* shlib-versions: Match alpha*.
+	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Add adjtimex.
+	* sysdeps/unix/sysv/linux/alpha/adjtimex.S: Remove.
+
+	* sysdeps/alpha/fpu/bits/mathinline.h (isunordered et al): New.
+	Implement copysign* with and without __ prefix.
+	Likewise for fabs; use builtin for gcc 2.8.
+	(floor*): New.
+	(fdim*): New.
+
+	* elf/elf.h (EF_SPARC*, EF_ALPHA*, SHT_ALPHA*, SHF_ALPHA*): New.
+	(R_SPARC*): Match current v9 ABI.
+
+	* sysdeps/wordsize-64/stdint.h (intptr_t): Is a long.
+
+	* sunrpc/clnt_udp.c (clntudp_call): Use socklen_t.
+	* sunrpc/pmap_rmt.c (clnt_broadcast): Likewise.
+	* sunrpc/svc_tcp.c (svctcp_create, rendezvous_request): Likewise.
+	* sysdeps/generic/getresgid.c: Use prototype form because of warning.
+	* sysdeps/unix/sysv/linux/getdents.c: Likewise.
+	* sysdeps/unix/sysv/linux/alpha/adjtime.c: Likewise.
+	* sysdeps/unix/grantpt.c (argv): Fix consts.
+	* sysdeps/unix/sysv/linux/getpt.c: Include <string.h>
+	* sysdeps/unix/sysv/linux/sigaction.c: Likewise.
+
 1998-02-27  Ulrich Drepper  <drepper@cygnus.com>
 
 	* misc/syslog.c: Change to allow user the interpretation of the
diff --git a/elf/elf.h b/elf/elf.h
index cf8403b..037abab 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -726,6 +726,16 @@ typedef struct
 
 /* SUN SPARC specific definitions.  */
 
+/* Values for Elf64_Ehdr.e_flags.  */
+
+#define EF_SPARCV9_MM		3
+#define EF_SPARCV9_TSO		0
+#define EF_SPARCV9_PSO		1
+#define EF_SPARCV9_RMO		2
+#define EF_SPARC_EXT_MASK	0xFFFF00
+#define EF_SPARC_SUN_US1	0x000200
+#define EF_SPARC_HAL_R1		0x000400
+
 /* SPARC relocs.  */
 
 #define R_SPARC_NONE	0		/* No reloc */
@@ -773,14 +783,23 @@ typedef struct
 #define R_SPARC_PC_LM22	39		/* Low miggle 22 bits of ... */
 #define R_SPARC_WDISP16	40		/* PC relative 16 bit shifted */
 #define R_SPARC_WDISP19	41		/* PC relative 19 bit shifted */
-#define R_SPARC_GLOB_JMP 42		/* ?? */
 #define R_SPARC_7	43		/* Direct 7 bit */
 #define R_SPARC_5	44		/* Direct 5 bit */
 #define R_SPARC_6	45		/* Direct 6 bit */
+#define R_SPARC_DISP64	46		/* PC relative 64 bit */
+#define R_SPARC_PLT64	47		/* Direct 64 bit ref to PLT entry */
+#define R_SPARC_HIX22	48		/* High 22 bit complemented */
+#define R_SPARC_LOX10	49		/* Truncated 11 bit complemented */
+#define R_SPARC_H44	50		/* Direct high 12 of 44 bit */
+#define R_SPARC_M44	51		/* Direct mid 22 of 44 bit */
+#define R_SPARC_L44	52		/* Direct low 10 of 44 bit */
+#define R_SPARC_REGISTER 53		/* Global register usage */
+#define R_SPARC_UA64	54		/* Direct 64 bit unaligned */
+#define R_SPARC_UA16	55		/* Direct 16 bit unaligned */
 
 /* For Sparc64, legal values for d_tag of Elf64_Dyn.  */
 
-#define DT_SPARC_PLTFMT	0x70000001	/* .plt format version/type */
+#define DT_SPARC_REGISTER 0x70000001
 #define DT_SPARC_NUM	2
 
 /* Bits present in AT_HWCAP, primarily for Sparc32.  */
@@ -950,7 +969,22 @@ typedef Elf32_Addr Elf32_Conflict;
 #define STT_PARISC_MILLICODE	13	/* Millicode function entry point.  */
 
 
-/* Alpha specific declarations.  */
+/* Alpha specific definitions.  */
+
+/* Legal values for e_flags field of Elf64_Ehdr.  */
+
+#define EF_ALPHA_32BIT		1	/* All addresses must be < 2GB.  */
+#define EF_ALPHA_CANRELAX	2	/* Relocations for relaxing exist.  */
+
+/* Legal values for sh_type field of Elf64_Shdr.  */
+
+/* These two are primerily concerned with ECOFF debugging info.  */
+#define SHT_ALPHA_DEBUG		0x70000001
+#define SHT_ALPHA_REGINFO	0x70000002
+
+/* Legal values for sh_flags field of Elf64_Shdr.  */
+
+#define SHF_ALPHA_GPREL		0x10000000
 
 /* Alpha relocs.  */
 
diff --git a/shlib-versions b/shlib-versions
index 988a81d..2745152 100644
--- a/shlib-versions
+++ b/shlib-versions
@@ -13,13 +13,13 @@ i.86-.*-.*		libm=6
 m68k-.*-.*		libm=6
 sparc-.*-.*		libm=6
 sparc64-.*-.*		libm=6
-alpha-.*-linux.*	libm=6.1
-alpha-.*-.*		libm=6
+alpha.*-.*-linux.*	libm=6.1
+alpha.*-.*-.*		libm=6
 powerpc-.*-.*		libm=6
 mips-.*-.*		libm=6
 
 # We provide libc.so.6 for Linux kernel versions 2.0 and later.
-alpha-.*-linux.*	libc=6.1
+alpha.*-.*-linux.*	libc=6.1
 .*-.*-linux.*		libc=6
 
 # libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
@@ -35,22 +35,22 @@ alpha-.*-linux.*	libc=6.1
 i.86-.*-linux.*		ld=ld-linux.so.2
 sparc-.*-linux.*	ld=ld-linux.so.2
 sparc64-.*-linux.*	ld=ld-linux64.so.2
-alpha-.*-linux.*	ld=ld-linux.so.2
+alpha.*-.*-linux.*	ld=ld-linux.so.2
 # We use the ELF ABI standard name for the default.
 .*-.*-.*		ld=ld.so.1
 
 # The -ldl interface (see <dlfcn.h>) is the same on all platforms.
-alpha-.*-linux.*	libdl=2.1
+alpha.*-.*-linux.*	libdl=2.1
 .*-.*-.*		libdl=2
 
 # So far the -lutil interface is the same on all platforms, except for the
 # `struct utmp' format, which depends on libc.
-alpha-.*-linux.*	libutil=1.1
+alpha.*-.*-linux.*	libutil=1.1
 .*-.*-.*		libutil=1
 
 # Version number 2 is used on other systems for the BIND 4.9.5 resolver
 # interface.
-alpha-.*-linux.*	libresolv=2.1
+alpha.*-.*-linux.*	libresolv=2.1
 .*-.*-.*		libresolv=2
 
 # Interface revision of nss_* modules.  This must match NSS_SHLIB_REVISION
@@ -66,18 +66,18 @@ alpha-.*-linux.*	libresolv=2.1
 .*-.*-.*		libnss_hesiod=2
 
 # Version for libnsl with YP and NIS+ functions.
-alpha-.*-linux.*	libnsl=1.1
+alpha.*-.*-linux.*	libnsl=1.1
 .*-.*-.*		libnsl=1
 
 # We use libdb.so.3 for the interface in version 2.x of the Berkeley DB code.
 .*-.*-.*		libdb=3
 
 # This defines the shared library version numbers we will install.
-alpha-.*-linux.*	libcrypt=1.1
+alpha.*-.*-linux.*	libcrypt=1.1
 .*-.*-.*		libcrypt=1
 
 # The gross patch for programs assuming broken locale implementations.
-alpha-.*-linux.*	libBrokenLocale=1.1
+alpha.*-.*-linux.*	libBrokenLocale=1.1
 .*-.*-.*		libBrokenLocale=1
 
 # The real-time library from POSIX.1b.
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index 28aa6ef..a0164f0 100644
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -233,7 +233,7 @@ clntudp_call (cl, proc, xargs, argsp, xresults, resultsp, utimeout)
   XDR *xdrs;
   int outlen = 0;
   int inlen;
-  size_t fromlen;
+  socklen_t fromlen;
 #ifdef FD_SETSIZE
   fd_set readfds;
   fd_set mask;
diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
index 9115491..ec0b84e 100644
--- a/sunrpc/pmap_rmt.c
+++ b/sunrpc/pmap_rmt.c
@@ -237,7 +237,7 @@ clnt_broadcast (prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult)
   XDR xdr_stream;
   XDR *xdrs = &xdr_stream;
   int outlen, inlen, nets;
-  size_t fromlen;
+  socklen_t fromlen;
   int sock;
   int on = 1;
 #ifdef FD_SETSIZE
diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
index e14a9ad..8d728bd 100644
--- a/sunrpc/svc_tcp.c
+++ b/sunrpc/svc_tcp.c
@@ -130,7 +130,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
   SVCXPRT *xprt;
   struct tcp_rendezvous *r;
   struct sockaddr_in addr;
-  size_t len = sizeof (struct sockaddr_in);
+  socklen_t len = sizeof (struct sockaddr_in);
 
   if (sock == RPC_ANYSOCK)
     {
@@ -232,7 +232,7 @@ rendezvous_request (SVCXPRT *xprt, struct rpc_msg *errmsg)
   int sock;
   struct tcp_rendezvous *r;
   struct sockaddr_in addr;
-  size_t len;
+  socklen_t len;
 
   r = (struct tcp_rendezvous *) xprt->xp_p1;
 again:
diff --git a/sysdeps/alpha/fpu/bits/mathinline.h b/sysdeps/alpha/fpu/bits/mathinline.h
index 2270312..492d9f1 100644
--- a/sysdeps/alpha/fpu/bits/mathinline.h
+++ b/sysdeps/alpha/fpu/bits/mathinline.h
@@ -18,29 +18,148 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifdef __GNUC__
-#if !defined __NO_MATH_INLINES && defined __OPTIMIZE__
+#ifndef _MATH_H
+# error "Never use <bits/mathinline.h> directly; include <math.h> instead."
+#endif
+
+#ifdef __cplusplus
+# define __MATH_INLINE __inline
+#else
+# define __MATH_INLINE extern __inline
+#endif
+
+#ifdef __USE_ISOC9X
+# define isunordered(x, y)				\
+  (__extension__					\
+   ({ double __r;					\
+      __asm ("cmptun/su %1,%2,%0\n\ttrapb"		\
+	     : "=&f" (__r) : "f" (x), "f"(y));		\
+      __r != 0; }))
+
+# define isgreater(x, y)				\
+  (__extension__					\
+   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);	\
+      !isunordered(__x, __y) && __x > __y; }))
+# define isgreaterequal(x, y)				\
+  (__extension__					\
+   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);	\
+      !isunordered(__x, __y) && __x >= __y; }))
+# define isless(x, y)					\
+  (__extension__					\
+   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);	\
+      !isunordered(__x, __y) && __x < __y; }))
+# define islessequal(x, y)				\
+  (__extension__					\
+   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);	\
+      !isunordered(__x, __y) && __x <= __y; }))
+# define islessgreater(x, y)				\
+  (__extension__					\
+   ({ __typeof__(x) __x = (x); __typeof__(y) __y = (y);	\
+      !isunordered(__x, __y) && __x != __y; }))
+#endif /* ISOC9X */
+
+#define __inline_copysign(NAME, TYPE)					\
+__MATH_INLINE TYPE							\
+NAME (TYPE __x, TYPE __y)						\
+{									\
+  TYPE __z;								\
+  __asm ("cpys %1, %2, %0" : "=f" (__z) : "f" (__y), "f" (__x));	\
+  return __z;								\
+}
+
+__inline_copysign(__copysignf, float)
+__inline_copysign(copysignf, float)
+__inline_copysign(__copysign, double)
+__inline_copysign(copysign, double)
+
+#undef __MATH_INLINE_copysign
+
+
+#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+__MATH_INLINE float __fabsf (float __x) { return __builtin_fabsf (__x); }
+__MATH_INLINE float fabsf (float __x) { return __builtin_fabsf (__x); }
+__MATH_INLINE double __fabs (double __x) { return __builtin_fabs (__x); }
+__MATH_INLINE double fabs (double __x) { return __builtin_fabs (__x); }
+#else
+#define __inline_fabs(NAME, TYPE)			\
+__MATH_INLINE TYPE					\
+NAME (TYPE __x)						\
+{							\
+  TYPE __z;						\
+  __asm ("cpys $f31, %1, %0" : "=f" (__z) : "f" (__x));	\
+  return __z;						\
+}
+
+__inline_fabs(__fabsf, float)
+__inline_fabs(fabsf, float)
+__inline_fabs(__fabs, double)
+__inline_fabs(fabs, double)
+
+#undef __inline_fabs
+#endif
+
 
-extern __inline double
-__copysign (double __x, double __y)
+/* Use the -inf rounding mode conversion instructions to implement
+   floor.  We note when the exponent is large enough that the value
+   must be integral, as this avoids unpleasant integer overflows.  */
+
+__MATH_INLINE float
+__floorf (float __x)
 {
-  __asm ("cpys %1, %2, %0" : "=f" (__x) : "f" (__y), "f" (__x));
+  if (fabsf (__x) < 16777216.0f)  /* 1 << FLT_MANT_DIG */
+    {
+      /* Note that Alpha S_Floating is stored in registers in a
+	 restricted T_Floating format, so we don't even need to
+	 convert back to S_Floating in the end.  The initial
+	 conversion to T_Floating is needed to handle denormals.  */
+
+      float __tmp1, __tmp2;
+
+      __asm ("cvtst/s %3,%2\n\t"
+	     "cvttq/svim %2,%1\n\t"
+	     "cvtqt/suim %1,%0\n\t"
+	     "trapb"
+	     : "=&f"(__x), "=&f"(__tmp1), "=&f"(__tmp2)
+	     : "f"(__x));
+    }
   return __x;
 }
 
-extern __inline double
-fabs (double __x)
+__MATH_INLINE double
+__floor (double __x)
 {
-  __asm ("cpys $f31, %1, %0" : "=f" (__x) : "f" (__x));
+  if (fabs (__x) < 9007199254740992.0)  /* 1 << DBL_MANT_DIG */
+    {
+      double __tmp1;
+      __asm ("cvttq/svim %2,%1\n\t"
+	     "cvtqt/suim %1,%0\n\t"
+	     "trapb"
+	     : "=&f"(__x), "=&f"(__tmp1)
+	     : "f"(__x));
+    }
   return __x;
 }
 
-extern __inline double
-atan (double __x)
+__MATH_INLINE float floorf (float __x) { return __floorf(__x); }
+__MATH_INLINE double floor (double __x) { return __floor(__x); }
+
+
+__MATH_INLINE float __fdimf (float __x, float __y)
 {
-  extern double __atan2 (double, double);
-  return __atan2 (__x, 1.0);
+  return __x < __y ? 0.0f : __x - __y;
 }
 
-#endif
-#endif
+__MATH_INLINE float fdimf (float __x, float __y)
+{
+  return __x < __y ? 0.0f : __x - __y;
+}
+
+__MATH_INLINE double __fdim (double __x, double __y)
+{
+  return __x < __y ? 0.0 : __x - __y;
+}
+
+__MATH_INLINE double fdim (double __x, double __y)
+{
+  return __x < __y ? 0.0 : __x - __y;
+}
diff --git a/sysdeps/generic/getresgid.c b/sysdeps/generic/getresgid.c
index 9381e07..daad81f 100644
--- a/sysdeps/generic/getresgid.c
+++ b/sysdeps/generic/getresgid.c
@@ -20,10 +20,7 @@
 #include <unistd.h>
 
 int
-__getresgid (egid, rgid, sgid)
-    gid_t egid;
-    gid_t rgid;
-    gid_t sgid;
+__getresgid (gid_t egid, gid_t rgid, gid_t sgid)
 {
   __set_errno (ENOSYS);
   return -1;
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index 5625c16..6ef8d49 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -36,7 +36,7 @@
 /* This "generic Unix" implementation works because we provide the program
    /usr/libexec/pt_chown, and it only depends on ptsname() working. */
 static const char helper[] = LIBEXECDIR "/pt_chown";
-static char *const argv[] = { "pt_chown", NULL };
+static const char *const argv[] = { "pt_chown", NULL };
 
 int
 grantpt (fd)
diff --git a/sysdeps/unix/sysv/linux/alpha/adjtime.c b/sysdeps/unix/sysv/linux/alpha/adjtime.c
index f7df5fc..b695ece 100644
--- a/sysdeps/unix/sysv/linux/alpha/adjtime.c
+++ b/sysdeps/unix/sysv/linux/alpha/adjtime.c
@@ -126,8 +126,7 @@ weak_alias (__adjtime, adjtime);
 extern int __syscall_adjtimex_tv64 (struct timex *tx);
 
 int
-__adjtimex_tv64 (tx)
-     struct timex *tx;
+__adjtimex_tv64 (struct timex *tx)
 {
   int ret;
 
diff --git a/sysdeps/unix/sysv/linux/alpha/adjtimex.S b/sysdeps/unix/sysv/linux/alpha/adjtimex.S
deleted file mode 100644
index 367b735..0000000
--- a/sysdeps/unix/sysv/linux/alpha/adjtimex.S
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright (C) 1998 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
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
-#include <sysdep.h>
-#define _ERRNO_H        1
-#include <bits/errno.h>
-
-/* The problem here is that initially we made struct timeval compatible with
-   OSF/1, using int32.  But we defined time_t with uint64, and later found
-   that POSIX requires tv_sec to be time_t.
-
-   So now we have to do compatibility stuff.  */
-
-.text
-
-LEAF(__syscall_adjtimex_tv64, 0)
-	ldgp	gp, 0(pv)
-#ifdef PROF
-	.set noat
-	lda	AT, _mcount
-	jsr	AT, (AT), _mcount
-	.set at
-#endif
-	.prologue 1
-
-#ifdef __NR_adjtimex
-	ldi	v0, SYS_ify(adjtimex)
-	callsys
-	bne	a3, $err64
-
-	/* Everything ok.  */
-	ret
-
-	/* If we didn't get ENOSYS, it is a real error.  */
-	.align 3
-$err64:
-#else
-	/* ENOSYS. */
-	ldi	v0, ENOSYS
-#endif
-	lda	pv, __syscall_error
-	jmp	zero, (pv), __syscall_error
-
-END(__syscall_adjtimex_tv64)
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index 26d4f15..96fbc0c 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -71,3 +71,6 @@ osf_utimes	-	osf_utimes	2	__utimes_tv32  __utimes@GLIBC_2.0 utimes@GLIBC_2.0
 osf_getrusage	-	osf_getrusage	2	__getrusage_tv32  __getrusage@GLIBC_2.0 getrusage@GLIBC_2.0
 osf_wait4	-	osf_wait4	2	__wait4_tv32  __wait4@GLIBC_2.0 wait4@GLIBC_2.0
 old_adjtimex	-	old_adjtimex	1	__adjtimex_tv32  __adjtimex@GLIBC_2.0 adjtimex@GLIBC_2.0
+
+# and one for timeval64 entry points
+adjtimex	adjtime	adjtimex	1	__syscall_adjtimex_tv64
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index b1b532a..f253878 100644
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -59,11 +59,7 @@ struct kernel_dirent
    correct number of bytes to read.  If we should be wrong, we can reset
    the file descriptor.  */
 ssize_t
-__getdirentries (fd, buf, nbytes, basep)
-     int fd;
-     char *buf;
-     size_t nbytes;
-     off_t *basep;
+__getdirentries (int fd, char *buf, size_t nbytes, off_t *basep)
 {
   off_t base = __lseek (fd, (off_t) 0, SEEK_CUR);
   off_t last_offset = base;
diff --git a/sysdeps/unix/sysv/linux/getpt.c b/sysdeps/unix/sysv/linux/getpt.c
index 8eea2ff..3c0b7a9 100644
--- a/sysdeps/unix/sysv/linux/getpt.c
+++ b/sysdeps/unix/sysv/linux/getpt.c
@@ -21,6 +21,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "pty-internal.h"
 
diff --git a/sysdeps/unix/sysv/linux/sigaction.c b/sysdeps/unix/sysv/linux/sigaction.c
index 5f9a7fe..49cb3b6 100644
--- a/sysdeps/unix/sysv/linux/sigaction.c
+++ b/sysdeps/unix/sysv/linux/sigaction.c
@@ -18,6 +18,7 @@
 
 #include <errno.h>
 #include <signal.h>
+#include <string.h>
 
 /* The difference here is that the sigaction structure used in the
    kernel is not the same as we use in the libc.  Therefore we must
diff --git a/sysdeps/wordsize-64/stdint.h b/sysdeps/wordsize-64/stdint.h
index 3e05aeb..c0e521a 100644
--- a/sysdeps/wordsize-64/stdint.h
+++ b/sysdeps/wordsize-64/stdint.h
@@ -78,7 +78,7 @@ typedef unsigned long int uint_fast64_t;
 
 
 /* Types for `void *' pointers.  */
-typedef int                intptr_t;
+typedef long int           intptr_t;
 typedef unsigned long int uintptr_t;
 
 
diff --git a/version.c b/version.c
index 3564c4e..2285c75 100644
--- a/version.c
+++ b/version.c
@@ -24,11 +24,11 @@ static const char __libc_version[] = VERSION;
 
 static const char banner[] =
 "GNU C Library "RELEASE" release version "VERSION", by Roland McGrath et al.\n\
-Compiled by GNU CC version "__VERSION__".\n\
 Copyright (C) 1992, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
-PARTICULAR PURPOSE.\n"
+PARTICULAR PURPOSE.\n\
+Compiled by GNU CC version "__VERSION__".\n"
 #include "version-info.h"
 "Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n";