* 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.

10 files changed, 143 insertions, 86 deletions

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;