aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/bzero.c2
-rw-r--r--sysdeps/generic/memccpy.c1
-rw-r--r--sysdeps/generic/vtimes.c4
-rw-r--r--sysdeps/m68k/fpu/e_atan2.c52
-rw-r--r--sysdeps/unix/Makefile2
-rw-r--r--sysdeps/unix/bsd/ualarm.c1
-rw-r--r--sysdeps/unix/sysv/linux/net/ppp_defs.h3
-rw-r--r--sysdeps/unix/sysv/linux/netinet/ip_fw.h1
-rw-r--r--sysdeps/wordsize-32/inttypes.h40
-rw-r--r--sysdeps/wordsize-64/inttypes.h40
10 files changed, 77 insertions, 69 deletions
diff --git a/sysdeps/generic/bzero.c b/sysdeps/generic/bzero.c
index eaa359d77e..7fda7c3b5e 100644
--- a/sysdeps/generic/bzero.c
+++ b/sysdeps/generic/bzero.c
@@ -22,7 +22,7 @@
/* Set N bytes of S to 0. */
void
-bzero (s, n)
+bzero (s, len)
void *s;
size_t len;
{
diff --git a/sysdeps/generic/memccpy.c b/sysdeps/generic/memccpy.c
index 8875abedd5..7c2d443863 100644
--- a/sysdeps/generic/memccpy.c
+++ b/sysdeps/generic/memccpy.c
@@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <stddef.h> /* For size_t and NULL. */
+#include <string.h>
/*
* Copy no more than N bytes of SRC to DEST, stopping when C is found.
diff --git a/sysdeps/generic/vtimes.c b/sysdeps/generic/vtimes.c
index 298f428b71..0c19a918f8 100644
--- a/sysdeps/generic/vtimes.c
+++ b/sysdeps/generic/vtimes.c
@@ -29,9 +29,7 @@
/* If VT is not NULL, write statistics for WHO into *VT.
Return 0 for success, -1 for failure. */
static int
-vtimes_one (vt, who)
- struct vtimes *vt;
- enum __rusage_who who;
+vtimes_one (struct vtimes *vt, enum __rusage_who who)
{
if (vt != NULL)
{
diff --git a/sysdeps/m68k/fpu/e_atan2.c b/sysdeps/m68k/fpu/e_atan2.c
index c012070a93..59bc990f5b 100644
--- a/sysdeps/m68k/fpu/e_atan2.c
+++ b/sysdeps/m68k/fpu/e_atan2.c
@@ -35,63 +35,67 @@ float_type
s(__ieee754_atan2) (float_type y, float_type x)
{
float_type pi, pi_2, z;
+ unsigned long y_cond, x_cond;
__asm ("fmovecr%.x %#0, %0" : "=f" (pi));
__asm ("fscale%.w %#-1, %0" : "=f" (pi_2) : "0" (pi));
- if (x != x || y != y)
+ y_cond = __m81_test (y);
+ x_cond = __m81_test (x);
+
+ if ((x_cond | y_cond) & __M81_COND_NAN)
z = x + y;
- else if (y == 0)
+ else if (y_cond & __M81_COND_ZERO)
{
- if (m81(__signbit) (x))
- z = m81(__signbit) (y) ? -pi : pi;
+ if (x_cond & __M81_COND_NEG)
+ z = y_cond & __M81_COND_NEG ? -pi : pi;
else
z = y;
}
- else if (m81(__isinf) (x))
+ else if (x_cond & __M81_COND_INF)
{
- if (m81(__isinf) (y))
+ if (y_cond & __M81_COND_INF)
{
float_type pi_4;
__asm ("fscale%.w %#-2, %0" : "=f" (pi_4) : "0" (pi));
- z = x > 0 ? pi_4 : 3 * pi_4;
+ z = x_cond & __M81_COND_NEG ? 3 * pi_4 : pi_4;
}
else
- z = x > 0 ? 0 : pi;
- if (m81(__signbit) (y))
+ z = x_cond & __M81_COND_NEG ? pi : 0;
+ if (y_cond & __M81_COND_NEG)
z = -z;
}
- else if (m81(__isinf) (y))
- z = y > 0 ? pi_2 : -pi_2;
- else if (x > 0)
+ else if (y_cond & __M81_COND_INF)
+ z = y_cond & __M81_COND_NEG ? -pi_2 : pi_2;
+ else if (x_cond & __M81_COND_NEG)
{
- if (y > 0)
+ if (y_cond & __M81_COND_NEG)
{
- if (x > y)
- z = m81(__atan) (y / x);
+ if (-x > -y)
+ z = -pi + m81(__atan) (y / x);
else
- z = pi_2 - m81(__atan) (x / y);
+ z = -pi_2 - m81(__atan) (x / y);
}
else
{
- if (x > -y)
- z = m81(__atan) (y / x);
+ if (-x > y)
+ z = pi + m81(__atan) (y / x);
else
- z = -pi_2 - m81(__atan) (x / y);
+ z = pi_2 - m81(__atan) (x / y);
}
}
else
{
- if (y < 0)
+ if (y_cond & __M81_COND_NEG)
{
- if (-x > y)
- z = -pi + m81(__atan) (y / x);
+ if (x > -y)
+ z = m81(__atan) (y / x);
else
z = -pi_2 - m81(__atan) (x / y);
}
else
{
- if (-x > y)
- z = pi + m81(__atan) (y / x);
+ if (x > y)
+ z = m81(__atan) (y / x);
else
z = pi_2 - m81(__atan) (x / y);
}
diff --git a/sysdeps/unix/Makefile b/sysdeps/unix/Makefile
index c9c5ed8fdc..f51dc508a0 100644
--- a/sysdeps/unix/Makefile
+++ b/sysdeps/unix/Makefile
@@ -199,7 +199,7 @@ $(common-objpfx)ioctls: $(sysdep_dir)/unix/snarf-ioctls \
$(sysincludedir)/sys/ioctl.h $(ioctl-includes)
$(dir $<)$(notdir $<) $(filter-out $<,$^) \
| fgrep -xv "`($(dir $<)$(notdir $<) $(termbits.h) \
- $(..)termios/sys/ttydefaults.h; \
+ $(..)sysdeps/generic/sys/ttydefaults.h; \
echo NULL) \
| sort | uniq`" \
| sort | uniq | tr '\012' ' ' > $@-tmp
diff --git a/sysdeps/unix/bsd/ualarm.c b/sysdeps/unix/bsd/ualarm.c
index c153fb1705..b9a1409bab 100644
--- a/sysdeps/unix/bsd/ualarm.c
+++ b/sysdeps/unix/bsd/ualarm.c
@@ -17,6 +17,7 @@
Boston, MA 02111-1307, USA. */
#include <sys/time.h>
+#include <unistd.h>
/* Set an alarm to go off (generating a SIGALRM signal) in VALUE microseconds.
If INTERVAL is nonzero, when the alarm goes off, the timer is reset to go
diff --git a/sysdeps/unix/sysv/linux/net/ppp_defs.h b/sysdeps/unix/sysv/linux/net/ppp_defs.h
index 5d613e0d0f..f8924c4f27 100644
--- a/sysdeps/unix/sysv/linux/net/ppp_defs.h
+++ b/sysdeps/unix/sysv/linux/net/ppp_defs.h
@@ -1,6 +1,9 @@
#ifndef _NET_PPP_DEFS_H
#define _NET_PPP_DEFS_H 1
+#define __need_time_t
+#include <time.h>
+
#include <asm/types.h>
#include <linux/ppp_defs.h>
diff --git a/sysdeps/unix/sysv/linux/netinet/ip_fw.h b/sysdeps/unix/sysv/linux/netinet/ip_fw.h
index 8ba10ae196..322467b5ff 100644
--- a/sysdeps/unix/sysv/linux/netinet/ip_fw.h
+++ b/sysdeps/unix/sysv/linux/netinet/ip_fw.h
@@ -53,6 +53,7 @@
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <netinet/udp.h>
+#include <net/if.h>
__BEGIN_DECLS
diff --git a/sysdeps/wordsize-32/inttypes.h b/sysdeps/wordsize-32/inttypes.h
index f9735a1309..97bfed5a0a 100644
--- a/sysdeps/wordsize-32/inttypes.h
+++ b/sysdeps/wordsize-32/inttypes.h
@@ -62,10 +62,10 @@ typedef int int_least32_t;
typedef long long int int_least64_t;
/* Unsigned. */
-typedef unsigned char int_least8_t;
-typedef unsigned short int int_least16_t;
-typedef unsigned int int_least32_t;
-typedef unsigned long long int int_least64_t;
+typedef unsigned char uint_least8_t;
+typedef unsigned short int uint_least16_t;
+typedef unsigned int uint_least32_t;
+typedef unsigned long long int uint_least64_t;
/* Fast types. */
@@ -77,10 +77,10 @@ typedef int int_fast32_t;
typedef long long int int_fast64_t;
/* Unsigned. */
-typedef unsigned char int_fast8_t;
-typedef unsigned int int_fast16_t;
-typedef unsigned int int_fast32_t;
-typedef unsigned long long int int_fast64_t;
+typedef unsigned char uint_fast8_t;
+typedef unsigned int uint_fast16_t;
+typedef unsigned int uint_fast32_t;
+typedef unsigned long long int uint_fast64_t;
/* Limits of integral types. */
@@ -122,21 +122,21 @@ typedef unsigned long long int int_fast64_t;
/* Minimum of fast signed integral types having a minimum size. */
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST16_MIN (-2147483647-1)
-#define INT_LEAST32_MIN (-2147483647-1)
-#define INT_LEAST64_MIN (-9223372036854775807LL-1)
+#define INT_FAST8_MIN (-128)
+#define INT_FAST16_MIN (-2147483647-1)
+#define INT_FAST32_MIN (-2147483647-1)
+#define INT_FAST64_MIN (-9223372036854775807LL-1)
/* Maximum of fast signed integral types having a minimum size. */
-#define INT_LEAST8_MAX (127)
-#define INT_LEAST16_MAX (2147483647)
-#define INT_LEAST32_MAX (2147483647)
-#define INT_LEAST64_MAX (9223372036854775807LL)
+#define INT_FAST8_MAX (127)
+#define INT_FAST16_MAX (2147483647)
+#define INT_FAST32_MAX (2147483647)
+#define INT_FAST64_MAX (9223372036854775807LL)
/* Maximum of fast unsigned integral types having a minimum size. */
-#define UINT_LEAST8_MAX (255U)
-#define UINT_LEAST16_MAX (4294967295U)
-#define UINT_LEAST32_MAX (4294967295U)
-#define UINT_LEAST64_MAX (18446744073709551615uLL)
+#define UINT_FAST8_MAX (255U)
+#define UINT_FAST16_MAX (4294967295U)
+#define UINT_FAST32_MAX (4294967295U)
+#define UINT_FAST64_MAX (18446744073709551615uLL)
/* Minimum for most efficient signed integral types. */
diff --git a/sysdeps/wordsize-64/inttypes.h b/sysdeps/wordsize-64/inttypes.h
index a86e49c24f..663b7b1a8d 100644
--- a/sysdeps/wordsize-64/inttypes.h
+++ b/sysdeps/wordsize-64/inttypes.h
@@ -62,10 +62,10 @@ typedef int int_least32_t;
typedef long int int_least64_t;
/* Unsigned. */
-typedef unsigned char int_least8_t;
-typedef unsigned short int int_least16_t;
-typedef unsigned int int_least32_t;
-typedef unsigned long int int_least64_t;
+typedef unsigned char uint_least8_t;
+typedef unsigned short int uint_least16_t;
+typedef unsigned int uint_least32_t;
+typedef unsigned long int uint_least64_t;
/* Fast types. */
@@ -77,10 +77,10 @@ typedef int int_fast32_t;
typedef long int int_fast64_t;
/* Unsigned. */
-typedef unsigned char int_fast8_t;
-typedef unsigned int int_fast16_t;
-typedef unsigned int int_fast32_t;
-typedef unsigned long int int_fast64_t;
+typedef unsigned char uint_fast8_t;
+typedef unsigned int uint_fast16_t;
+typedef unsigned int uint_fast32_t;
+typedef unsigned long int uint_fast64_t;
/* Limits of integral types. */
@@ -122,21 +122,21 @@ typedef unsigned long int int_fast64_t;
/* Minimum of fast signed integral types having a minimum size. */
-#define INT_LEAST8_MIN (-128)
-#define INT_LEAST16_MIN (-2147483647-1)
-#define INT_LEAST32_MIN (-2147483647-1)
-#define INT_LEAST64_MIN (-9223372036854775807L-1)
+#define INT_FAST8_MIN (-128)
+#define INT_FAST16_MIN (-2147483647-1)
+#define INT_FAST32_MIN (-2147483647-1)
+#define INT_FAST64_MIN (-9223372036854775807L-1)
/* Maximum of fast signed integral types having a minimum size. */
-#define INT_LEAST8_MAX (127)
-#define INT_LEAST16_MAX (2147483647)
-#define INT_LEAST32_MAX (2147483647)
-#define INT_LEAST64_MAX (9223372036854775807L)
+#define INT_FAST8_MAX (127)
+#define INT_FAST16_MAX (2147483647)
+#define INT_FAST32_MAX (2147483647)
+#define INT_FAST64_MAX (9223372036854775807L)
/* Maximum of fast unsigned integral types having a minimum size. */
-#define UINT_LEAST8_MAX (255U)
-#define UINT_LEAST16_MAX (4294967295U)
-#define UINT_LEAST32_MAX (4294967295U)
-#define UINT_LEAST64_MAX (18446744073709551615uL)
+#define UINT_FAST8_MAX (255U)
+#define UINT_FAST16_MAX (4294967295U)
+#define UINT_FAST32_MAX (4294967295U)
+#define UINT_FAST64_MAX (18446744073709551615uL)
/* Minimum for most efficient signed integral types. */