summaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-05-22 02:19:00 +0000
committerUlrich Drepper <drepper@redhat.com>1997-05-22 02:19:00 +0000
commitbfbc57545a197afff72572c3a6f0563023d553a5 (patch)
tree52096edcfa9545eecacfa230d8a5d440b8564f80 /sysdeps
parent9498096c93a5755cd48a72762d2b6701bd7d796e (diff)
downloadglibc-bfbc57545a197afff72572c3a6f0563023d553a5.tar.gz
1997-05-22 04:09 Ulrich Drepper <drepper@cygnus.com> * sunrpc/clnt_perr.c (clnt_sperrno): Change type of variable i to size_t to prevent warning. * sunrpc/rpcinfo.c (get_inet_address): Use UNADDR_NONE and INADDR_ANY instead of numeric values. Various cleanups. * sunrpc/xdr_mem.c: Use `const char *' instead of `const caddr_t' for xdrmem_putbytes. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/unix/sysv/linux/arm/syscall.s: Pretty printing. * sysdeps/unix/sysv/linux/arm/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. 1997-05-21 22:22 Philip Blundell <pjb27@cam.ac.uk> * inet/Makefile (headers): Add netinet/ip6.h, netinet/icmp6.h. * sysdeps/generic/netinet/ip6.h: New file (for IPv6 Advanced API). * sysdeps/generic/netinet/icmp6.h: Likewise. * sysdeps/unix/sysv/linux/netinet/in.h: Fix typo. * sysdeps/stub/direntry.h (struct dirent): Add d_fileno (needed by glob.c). * sysdeps/standalone/arm/errnos.h: Add EPROTOTYPE, ESRCH. * sysdeps/unix/arm/sysdep.h: Avoid warning about nested comments. * sysdeps/stub/accept.c (accept): Make args match prototype. * sysdeps/stub/bind.c (bind): Likewise. * sysdeps/stub/connect.c (connect): Likewise. * sysdeps/stub/getpeername.c (getpeername): Likewise. * sysdeps/stub/getsockname.c (getsockname): Likewise. * sysdeps/stub/recvfrom.c (recvfrom): Likewise. * sysdeps/stub/send.c (send): Likewise. * sysdeps/stub/ttyname_r.c (ttyname_r): Likewise. * sysdeps/stub/readv.c (readv): Likewise. * sysdeps/stub/writev.c (writev): Likewise. * sysdeps/stub/sendto.c (sendto): Likewise. * sysdeps/unix/sysv/linux/arm/profil-counter.h: New file. 1997-05-18 12:46 Philip Blundell <pjb27@cam.ac.uk> * sysdeps/unix/sysv/linux/socketbits.h: Add new macros CMSG_SPACE, CMSG_LEN, CMSG_ALIGN (for IPv6 Advanced API). 1997-05-21 13:51 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/shmat.c (shmat): Add cast to prevent warning. * sunrpc/rpcsvc/rusers.x: Provide prototypes for implemented functions, include <rpc/xdr.h>. * string/strverscmp.c: Correct typos in comment. * sunrpc/rpc/xdr.h: Add more `const'. * sunrpc/xdr_stdio.c: Likewise. * sunrpc/xdr_rec.c: Likewise.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/netinet/icmp6.h203
-rw-r--r--sysdeps/generic/netinet/ip6.h44
-rw-r--r--sysdeps/standalone/arm/errnos.h2
-rw-r--r--sysdeps/stub/accept.c2
-rw-r--r--sysdeps/stub/bind.c2
-rw-r--r--sysdeps/stub/connect.c2
-rw-r--r--sysdeps/stub/direntry.h1
-rw-r--r--sysdeps/stub/getpeername.c2
-rw-r--r--sysdeps/stub/getsockname.c2
-rw-r--r--sysdeps/stub/readv.c2
-rw-r--r--sysdeps/stub/recvfrom.c2
-rw-r--r--sysdeps/stub/send.c2
-rw-r--r--sysdeps/stub/sendto.c4
-rw-r--r--sysdeps/stub/ttyname_r.c2
-rw-r--r--sysdeps/stub/writev.c2
-rw-r--r--sysdeps/unix/arm/sysdep.h2
-rw-r--r--sysdeps/unix/sysv/linux/arm/profil-counter.h26
-rw-r--r--sysdeps/unix/sysv/linux/arm/syscall.S8
-rw-r--r--sysdeps/unix/sysv/linux/arm/sysdep.h34
-rw-r--r--sysdeps/unix/sysv/linux/i386/sysdep.h36
-rw-r--r--sysdeps/unix/sysv/linux/netinet/in.h2
-rw-r--r--sysdeps/unix/sysv/linux/shmat.c2
-rw-r--r--sysdeps/unix/sysv/linux/socketbits.h8
23 files changed, 336 insertions, 56 deletions
diff --git a/sysdeps/generic/netinet/icmp6.h b/sysdeps/generic/netinet/icmp6.h
new file mode 100644
index 0000000000..f41cdfeeeb
--- /dev/null
+++ b/sysdeps/generic/netinet/icmp6.h
@@ -0,0 +1,203 @@
+/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 General Public License as published by
+ the Free Software Foundation; either version 2, 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 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. */
+
+#ifndef _NETINET_ICMP6_H
+#define _NETINET_ICMP6_H 1
+
+#include <sys/types.h>
+
+#define ICMPV6_FILTER 1
+
+#define ICMPV6_FILTER_BLOCK 1
+#define ICMPV6_FILTER_PASS 2
+#define ICMPV6_FILTER_BLOCKOTHERS 3
+#define ICMPV6_FILTER_PASSONLY 4
+
+struct icmpv6_filter
+ {
+ u_int32_t data[8];
+ };
+
+struct icmpv6hdr
+ {
+ u_int8_t icmpv6_type; /* type field */
+ u_int8_t icmpv6_code; /* code field */
+ u_int16_t icmpv6_cksum; /* checksum field */
+ union
+ {
+ u_int32_t un_data32[1]; /* type-specific field */
+ u_int16_t un_data16[2]; /* type-specific field */
+ u_int8_t un_data8[4]; /* type-specific field */
+ } icmpv6_dataun;
+ };
+
+#define icmpv6_data32 icmpv6_dataun.un_data32
+#define icmpv6_data16 icmpv6_dataun.un_data16
+#define icmpv6_data8 icmpv6_dataun.un_data8
+#define icmpv6_pptr icmpv6_data32[0] /* parameter prob */
+#define icmpv6_mtu icmpv6_data32[0] /* packet too big */
+#define icmpv6_id icmpv6_data16[0] /* echo request/reply */
+#define icmpv6_seq icmpv6_data16[1] /* echo request/reply */
+#define icmpv6_maxdelay icmpv6_data16[0] /* mcast group membership */
+
+#define ICMPV6_DEST_UNREACH 1
+#define ICMPV6_PACKET_TOOBIG 2
+#define ICMPV6_TIME_EXCEEDED 3
+#define ICMPV6_PARAMETER_PROBLEM 4
+#define ICMPV6_INFOMSG_MASK 128 /* message is info if bit set */
+#define ICMPV6_ECHOREQUEST 128
+#define ICMPV6_ECHOREPLY 129
+#define ICMPV6_MGM_QUERY 130
+#define ICMPV6_MGM_REPORT 131
+#define ICMPV6_MGM_REDUCTION 132
+
+#define ICMPV6_DEST_UNREACH_NOROUTE 0
+#define ICMPV6_DEST_UNREACH_ADMIN 1 /* administratively prohibited */
+#define ICMPV6_DEST_UNREACH_NOTNEIGHBOR 2 /* not a neighbor (and must be) */
+#define ICMPV6_DEST_UNREACH_ADDR 3
+#define ICMPV6_DEST_UNREACH_NOPORT 4
+#define ICMPV6_TIME_EXCEED_HOPS 0 /* Hop Limit == 0 in transit */
+#define ICMPV6_TIME_EXCEED_REASSEMBLY 1 /* Reassembly time out */
+#define ICMPV6_PARAMPROB_HEADER 0 /* erroneous header field */
+#define ICMPV6_PARAMPROB_NEXTHEADER 1 /* unrecognized Next Header */
+#define ICMPV6_PARAMPROB_OPTION 2 /* unrecognized option */
+
+#if defined(__OPTIMIZE__)
+#include <asm/bitops.h>
+
+#define ICMPV6_FILTER_WILLPASS(type, filterp) \
+ (test_bit(type, filterp) == 0)
+
+#define ICMPV6_FILTER_WILLBLOCK(type, filterp) \
+ test_bit(type, filterp)
+
+#define ICMPV6_FILTER_SETPASS(type, filterp) \
+ clear_bit(type & 0x1f, &((filterp)->data[type >> 5]))
+
+#define ICMPV6_FILTER_SETBLOCK(type, filterp) \
+ set_bit(type & 0x1f, &((filterp)->data[type >> 5]))
+#else
+#define ICMPV6_FILTER_WILLPASS(type, filterp) \
+ ((((filterp)->data[(type) >> 5]) & (1 << ((type) & 31))) == 0)
+
+#define ICMPV6_FILTER_WILLBLOCK(type, filterp) \
+ ((((filterp)->data[(type) >> 5]) & (1 << ((type) & 31))) != 0)
+
+#define ICMPV6_FILTER_SETPASS(type, filterp) \
+ ((((filterp)->data[(type) >> 5]) &= ~(1 << ((type) & 31))))
+
+#define ICMPV6_FILTER_SETBLOCK(type, filterp) \
+ ((((filterp)->data[(type) >> 5]) |= (1 << ((type) & 31))))
+#endif
+
+#define ICMPV6_FILTER_SETPASSALL(filterp) \
+ memset(filterp, 0, sizeof(struct icmpv6_filter));
+
+#define ICMPV6_FILTER_SETBLOCKALL(filterp) \
+ memset(filterp, 0xFF, sizeof(struct icmpv6_filter));
+
+#define ND6_ROUTER_SOLICITATION 133
+#define ND6_ROUTER_ADVERTISEMENT 134
+#define ND6_NEIGHBOR_SOLICITATION 135
+#define ND6_NEIGHBOR_ADVERTISEMENT 136
+#define ND6_REDIRECT 137
+
+enum nd6_option
+ {
+ ND6_OPT_SOURCE_LINKADDR=1,
+ ND6_OPT_TARGET_LINKADDR=2,
+ ND6_OPT_PREFIX_INFORMATION=3,
+ ND6_OPT_REDIRECTED_HEADER=4,
+ ND6_OPT_MTU=5,
+ ND6_OPT_ENDOFLIST=256
+ };
+
+struct nd6_router_solicit /* router solicitation */
+ {
+ struct icmpv6hdr rsol_hdr;
+ };
+
+#define rsol_type rsol_hdr.icmpv6_type
+#define rsol_code rsol_hdr.icmpv6_code
+#define rsol_cksum rsol_hdr.icmpv6_cksum
+#define rsol_reserved rsol_hdr.icmpv6_data32[0]
+
+struct nd6_router_advert
+ {
+ struct icmpv6hdr radv_hdr;
+ u_int32_t radv_reachable; /* reachable time */
+ u_int32_t radv_retransmit; /* reachable retransmit time */
+ };
+
+#define radv_type radv_hdr.icmpv6_type
+#define radv_code radv_hdr.icmpv6_code
+#define radv_cksum radv_hdr.icmpv6_cksum
+#define radv_maxhoplimit radv_hdr.icmpv6_data8[0]
+#define radv_m_o_res radv_hdr.icmpv6_data8[1]
+#define ND6_RADV_M_BIT 0x80
+#define ND6_RADV_O_BIT 0x40
+#define radv_router_lifetime radv_hdr.icmpv6_data16[1]
+
+struct nd6_nsolicitation /* neighbor solicitation */
+ {
+ struct icmpv6hdr nsol6_hdr;
+ struct in6_addr nsol6_target;
+ };
+
+struct nd6_nadvertisement /* neighbor advertisement */
+ {
+ struct icmpv6hdr nadv6_hdr;
+ struct in6_addr nadv6_target;
+ };
+
+#define nadv6_flags nadv6_hdr.icmpv6_data32[0]
+#define ND6_NADVERFLAG_ISROUTER 0x80
+#define ND6_NADVERFLAG_SOLICITED 0x40
+#define ND6_NADVERFLAG_OVERRIDE 0x20
+
+struct nd6_redirect /* redirect */
+ {
+ struct icmpv6hdr redirect_hdr;
+ struct in6_addr redirect_target;
+ struct in6_addr redirect_destination;
+ };
+
+struct nd6_opt_prefix_info /* prefix information */
+ {
+ u_int8_t opt_type;
+ u_int8_t opt_length;
+ u_int8_t opt_prefix_length;
+ u_int8_t opt_l_a_res;
+ u_int32_t opt_valid_life;
+ u_int32_t opt_preferred_life;
+ u_int32_t opt_reserved2;
+ struct in6_addr opt_prefix;
+ };
+
+#define ND6_OPT_PI_L_BIT 0x80
+#define ND6_OPT_PI_A_BIT 0x40
+
+struct nd6_opt_mtu /* MTU option */
+ {
+ u_int8_t opt_type;
+ u_int8_t opt_length;
+ u_int16_t opt_reserved;
+ u_int32_t opt_mtu;
+ };
+
+#endif /* _NETINET6_ICMPV6_H */
diff --git a/sysdeps/generic/netinet/ip6.h b/sysdeps/generic/netinet/ip6.h
new file mode 100644
index 0000000000..487cafa374
--- /dev/null
+++ b/sysdeps/generic/netinet/ip6.h
@@ -0,0 +1,44 @@
+/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 General Public License as published by
+ the Free Software Foundation; either version 2, 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 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. */
+
+#ifndef _NETINET_IP6_H
+#define _NETINET_IP6_H 1
+
+#include <netinet/in.h>
+#include <endian.h>
+
+struct ipv6hdr {
+#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ u_int8_t ipv6_version:4;
+ u_int8_t ipv6_priority:4; /* going away? */
+ u_int32_t ipv6_flowid:24;
+#elif (__BYTE_ORDER == __BIG_ENDIAN)
+ u_int32_t ipv6_flowid:24;
+ u_int8_t ipv6_priority:4; /* going away? */
+ u_int8_t ipv6_version:4;
+#else
+#error Unknown endianness
+#endif
+ u_int16_t ipv6_len;
+ u_int8_t ipv6_nextheader;
+ u_int8_t ipv6_hoplimit;
+ struct in6_addr ipv6_src;
+ struct in6_addr ipv6_dst;
+};
+
+#endif /* _NETINET_IP6_H */
diff --git a/sysdeps/standalone/arm/errnos.h b/sysdeps/standalone/arm/errnos.h
index 0b635e649d..428fe9eb77 100644
--- a/sysdeps/standalone/arm/errnos.h
+++ b/sysdeps/standalone/arm/errnos.h
@@ -44,6 +44,8 @@ Cambridge, MA 02139, USA. */
#define EILSEQ 16
#define ENOEXEC 17
#define ENOENT 18
+#define EPROTOTYPE 19
+#define ESRCH 20
#endif
#define __set_errno(val) errno = (val)
diff --git a/sysdeps/stub/accept.c b/sysdeps/stub/accept.c
index e9a774c026..6934397925 100644
--- a/sysdeps/stub/accept.c
+++ b/sysdeps/stub/accept.c
@@ -27,7 +27,7 @@ Cambridge, MA 02139, USA. */
int
accept (fd, addr, addr_len)
int fd;
- struct sockaddr *addr;
+ __SOCKADDR_ARG addr;
size_t *addr_len;
{
__set_errno (ENOSYS);
diff --git a/sysdeps/stub/bind.c b/sysdeps/stub/bind.c
index 7f4d8145b8..22944c393b 100644
--- a/sysdeps/stub/bind.c
+++ b/sysdeps/stub/bind.c
@@ -23,7 +23,7 @@ Cambridge, MA 02139, USA. */
int
bind (fd, addr, len)
int fd;
- const struct sockaddr *addr;
+ __CONST_SOCKADDR_ARG addr;
size_t len;
{
__set_errno (ENOSYS);
diff --git a/sysdeps/stub/connect.c b/sysdeps/stub/connect.c
index 0d642cbcea..be10fc3345 100644
--- a/sysdeps/stub/connect.c
+++ b/sysdeps/stub/connect.c
@@ -26,7 +26,7 @@ Cambridge, MA 02139, USA. */
int
connect (fd, addr, len)
int fd;
- const struct sockaddr *addr;
+ __CONST_SOCKADDR_ARG addr;
size_t len;
{
__set_errno (ENOSYS);
diff --git a/sysdeps/stub/direntry.h b/sysdeps/stub/direntry.h
index 4b22f31bd6..2f7dca78aa 100644
--- a/sysdeps/stub/direntry.h
+++ b/sysdeps/stub/direntry.h
@@ -20,4 +20,5 @@
struct dirent
{
char d_name[1]; /* Variable length. */
+ int d_fileno;
};
diff --git a/sysdeps/stub/getpeername.c b/sysdeps/stub/getpeername.c
index 85256ad7ed..a2eb4ad79c 100644
--- a/sysdeps/stub/getpeername.c
+++ b/sysdeps/stub/getpeername.c
@@ -24,7 +24,7 @@ Cambridge, MA 02139, USA. */
int
getpeername (fd, addr, len)
int fd;
- struct sockaddr *addr;
+ __SOCKADDR_ARG addr;
size_t *len;
{
__set_errno (ENOSYS);
diff --git a/sysdeps/stub/getsockname.c b/sysdeps/stub/getsockname.c
index 17bb2b8a24..517ccfea17 100644
--- a/sysdeps/stub/getsockname.c
+++ b/sysdeps/stub/getsockname.c
@@ -23,7 +23,7 @@ Cambridge, MA 02139, USA. */
int
getsockname (fd, addr, len)
int fd;
- struct sockaddr *addr;
+ __SOCKADDR_ARG addr;
size_t *len;
{
__set_errno (ENOSYS);
diff --git a/sysdeps/stub/readv.c b/sysdeps/stub/readv.c
index a3240df239..8dd22d9649 100644
--- a/sysdeps/stub/readv.c
+++ b/sysdeps/stub/readv.c
@@ -29,7 +29,7 @@ int
__readv (fd, vector, count)
int fd;
const struct iovec *vector;
- size_t count;
+ int count;
{
__set_errno (ENOSYS);
return -1;
diff --git a/sysdeps/stub/recvfrom.c b/sysdeps/stub/recvfrom.c
index 47973ed896..e81946cb90 100644
--- a/sysdeps/stub/recvfrom.c
+++ b/sysdeps/stub/recvfrom.c
@@ -28,7 +28,7 @@ recvfrom (fd, buf, n, flags, addr, addr_len)
void *buf;
size_t n;
int flags;
- struct sockaddr *addr;
+ __SOCKADDR_ARG addr;
size_t *addr_len;
{
__set_errno (ENOSYS);
diff --git a/sysdeps/stub/send.c b/sysdeps/stub/send.c
index e921fd74bd..fbf8186ed5 100644
--- a/sysdeps/stub/send.c
+++ b/sysdeps/stub/send.c
@@ -23,7 +23,7 @@ Cambridge, MA 02139, USA. */
int
send (fd, buf, n, flags)
int fd;
- void *buf;
+ __const __ptr_t buf;
size_t n;
int flags;
{
diff --git a/sysdeps/stub/sendto.c b/sysdeps/stub/sendto.c
index 26353919a1..a05717ae68 100644
--- a/sysdeps/stub/sendto.c
+++ b/sysdeps/stub/sendto.c
@@ -24,10 +24,10 @@ Cambridge, MA 02139, USA. */
int
sendto (fd, buf, n, flags, addr, addr_len)
int fd;
- void *buf;
+ __const __ptr_t buf;
size_t n;
int flags;
- const struct sockaddr *addr;
+ __CONST_SOCKADDR_ARG addr;
size_t addr_len;
{
__set_errno (ENOSYS);
diff --git a/sysdeps/stub/ttyname_r.c b/sysdeps/stub/ttyname_r.c
index 7a05629c43..3c0306caaa 100644
--- a/sysdeps/stub/ttyname_r.c
+++ b/sysdeps/stub/ttyname_r.c
@@ -26,7 +26,7 @@ int
ttyname_r (fd, buf, buflen)
int fd;
char *buf;
- int buflen;
+ size_t buflen;
{
__set_errno (ENOSYS);
return -1;
diff --git a/sysdeps/stub/writev.c b/sysdeps/stub/writev.c
index 1fd7c2ec73..d18d73cddc 100644
--- a/sysdeps/stub/writev.c
+++ b/sysdeps/stub/writev.c
@@ -29,7 +29,7 @@ int
__writev (fd, vector, count)
int fd;
const struct iovec *vector;
- size_t count;
+ int count;
{
__set_errno (ENOSYS);
return -1;
diff --git a/sysdeps/unix/arm/sysdep.h b/sysdeps/unix/arm/sysdep.h
index 1c580731ba..b1860dd443 100644
--- a/sysdeps/unix/arm/sysdep.h
+++ b/sysdeps/unix/arm/sysdep.h
@@ -19,7 +19,7 @@ Cambridge, MA 02139, USA. */
#include <sysdeps/unix/sysdep.h>
#include <sysdeps/arm/sysdep.h>
-/* Some definitions to allow the assembler in sysdeps/unix/*.S to build
+/* Some definitions to allow the assembler in sysdeps/unix/ to build
without needing ARM-specific versions of all the files. */
#define ret RETINSTR(mov, pc, r14)
diff --git a/sysdeps/unix/sysv/linux/arm/profil-counter.h b/sysdeps/unix/sysv/linux/arm/profil-counter.h
new file mode 100644
index 0000000000..a915da7788
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/arm/profil-counter.h
@@ -0,0 +1,26 @@
+/* Low-level statistical profiling support function. Linux/ARM version.
+ Copyright (C) 1996, 1997 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 <sigcontext.h>
+
+void
+profil_counter (int signo, struct sigcontext sc)
+{
+ profil_count ((void *) sc.eip);
+}
diff --git a/sysdeps/unix/sysv/linux/arm/syscall.S b/sysdeps/unix/sysv/linux/arm/syscall.S
index 7a87278303..bc2bc7dbaa 100644
--- a/sysdeps/unix/sysv/linux/arm/syscall.S
+++ b/sysdeps/unix/sysv/linux/arm/syscall.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997 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
@@ -26,10 +26,10 @@ ENTRY (syscall)
/* Normally encoding the system call number in the instruction is
good. But we pay the price here. */
-
+
sub sp, sp, $0xc @ get 3 words on the stack
orr r0, r0, $0xef000000 @ make up a SWI instruction
- orr r0, r0, $SWI_BASE
+ orr r0, r0, $SWI_BASE
str r0, [sp]
ldr r0, _reti
str r0, [sp, $4]
@@ -43,5 +43,5 @@ _ret: add sp, sp, $0xc
RETINSTR(mov, pc, r14)
_reti: .word 0xe51ff004 @ ldr pc, [pc, $4]
-
+
PSEUDO_END (syscall)
diff --git a/sysdeps/unix/sysv/linux/arm/sysdep.h b/sysdeps/unix/sysv/linux/arm/sysdep.h
index 6478a5d182..0aa085d351 100644
--- a/sysdeps/unix/sysv/linux/arm/sysdep.h
+++ b/sysdeps/unix/sysv/linux/arm/sysdep.h
@@ -1,22 +1,22 @@
/* Copyright (C) 1992, 93, 95, 96, 97 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>, August 1995.
-ARM changes by Philip Blundell, <pjb27@cam.ac.uk>, May 1997.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>, August 1995.
+ ARM changes by Philip Blundell, <pjb27@cam.ac.uk>, May 1997.
-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 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.
+ 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., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ 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. */
#ifndef _LINUX_ARM_SYSDEP_H
#define _LINUX_ARM_SYSDEP_H 1
@@ -61,12 +61,12 @@ Cambridge, MA 02139, USA. */
#ifndef PIC
#define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
#else
-#error Aiee
+#error Aiee
#endif /* PIC */
#undef DO_CALL
#define DO_CALL(args, syscall_name) \
- swi SYS_ify (syscall_name);
+ swi SYS_ify (syscall_name);
#endif /* ASSEMBLER */
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index 7418982c2a..a38e4b3531 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -1,21 +1,21 @@
-/* Copyright (C) 1992, 93, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>, August 1995.
-
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+/* Copyright (C) 1992, 93, 95, 96, 97 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>, August 1995.
+
+ 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. */
#ifndef _LINUX_I386_SYSDEP_H
#define _LINUX_I386_SYSDEP_H 1
diff --git a/sysdeps/unix/sysv/linux/netinet/in.h b/sysdeps/unix/sysv/linux/netinet/in.h
index 451f8f5a20..b0c793e7cf 100644
--- a/sysdeps/unix/sysv/linux/netinet/in.h
+++ b/sysdeps/unix/sysv/linux/netinet/in.h
@@ -301,7 +301,7 @@ extern u_int16_t htons __P ((u_int16_t __hostshort));
(((u_int32_t *)(a))[2] == 0) && (ntohl(((u_int32_t *)(a))[3]) > 1))
-/* Bind socket to a priviledged IP port. */
+/* Bind socket to a privileged IP port. */
extern int bindresvport __P ((int __sockfd, struct sockaddr_in *__sin));
diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c
index 070b00c30f..9d36b26aa2 100644
--- a/sysdeps/unix/sysv/linux/shmat.c
+++ b/sysdeps/unix/sysv/linux/shmat.c
@@ -32,7 +32,7 @@ shmat (shmid, shmaddr, shmflg)
int retval;
unsigned long raddr;
- retval = __ipc (IPCOP_shmat, shmid, shmflg, (int) &raddr, shmaddr);
+ retval = __ipc (IPCOP_shmat, shmid, shmflg, (int) &raddr, (void *) shmaddr);
return ((unsigned long int) retval > -(unsigned long int) SHMLBA
? (void *) retval : (void *) raddr);
}
diff --git a/sysdeps/unix/sysv/linux/socketbits.h b/sysdeps/unix/sysv/linux/socketbits.h
index 101afc268c..e60f903fc5 100644
--- a/sysdeps/unix/sysv/linux/socketbits.h
+++ b/sysdeps/unix/sysv/linux/socketbits.h
@@ -158,9 +158,13 @@ struct cmsghdr
#endif
#define CMSG_NXTHDR(mhdr, cmsg) __cmsg_nxthdr (mhdr, cmsg)
#define CMSG_FIRSTHDR(mhdr) \
- ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) \
+ ((size_t) (mhdr)->msg_controllen >= sizeof (struct cmsghdr) \
? (struct cmsghdr *) (mhdr)->msg_control : (struct cmsghdr *) NULL)
-
+#define CMSG_ALIGN(len) (((len) + sizeof (size_t) - 1) \
+ & ~(sizeof (size_t) - 1))
+#define CMSG_SPACE(len) (CMSG_ALIGN (len) \
+ + CMSG_ALIGN (sizeof (struct cmsghdr)))
+#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
#ifndef _EXTERN_INLINE
# define _EXTERN_INLINE extern __inline