This commit was manufactured by cvs2svn to create branch 'newlib-autotools-

branch'.

Sprout from newlib-csl-20060320-branch 2006-03-21 00:57:35 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'newlib-'
Cherrypick from master 2006-03-29 22:38:46 UTC Jeff Johnston <jjohnstn@redhat.com> '':
    compile
    libgloss/ChangeLog
    libgloss/mt/startup-16-002.S
    libgloss/mt/startup-16-003.S
    libgloss/mt/startup-ms2.S
    newlib/ChangeLog
    newlib/configure
    newlib/configure.host
    newlib/configure.in
    newlib/libc/stdio/freopen.c
    newlib/libc/stdio64/freopen64.c
    newlib/libc/sys/linux/include/net/if.h
    newlib/libc/sys/linux/include/netinet/ip.h
    newlib/libc/sys/linux/io.c
    newlib/libc/sys/linux/net/name6.c
    newlib/libc/sys/linux/sys/ioccom.h
    newlib/libtool.m4

5 files changed, 14 insertions, 9 deletions

diff --git a/newlib/libc/sys/linux/include/net/if.h b/newlib/libc/sys/linux/include/net/if.h
index bf021e6f9..5671b11f4 100644
--- a/newlib/libc/sys/linux/include/net/if.h
+++ b/newlib/libc/sys/linux/include/net/if.h
@@ -38,6 +38,7 @@
 #define	_NET_IF_H_
 
 #include <sys/queue.h>
+#include <sys/socket.h>
 
 /*
  * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
@@ -122,7 +123,7 @@ struct if_data {
 #define	IFF_DEBUG	0x4		/* turn on debugging */
 #define	IFF_LOOPBACK	0x8		/* is a loopback net */
 #define	IFF_POINTOPOINT	0x10		/* interface is point-to-point link */
-#define	IFF_SMART	0x20		/* interface manages own routes */
+#define	IFF_NOTRAILERS	0x20		/* avoid use of trailers */
 #define	IFF_RUNNING	0x40		/* resources allocated */
 #define	IFF_NOARP	0x80		/* no address resolution protocol */
 #define	IFF_PROMISC	0x100		/* receive all packets */
@@ -147,7 +148,7 @@ struct if_data {
 /* flags set internally only: */
 #define	IFF_CANTCHANGE \
 	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_RUNNING|IFF_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART)
+	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_NOTRAILERS)
 
 /* Capabilities that interfaces can advertise. */
 #define IFCAP_RXCSUM		0x0001  /* can offload checksum on RX */
@@ -227,6 +228,7 @@ struct	ifreq {
 		struct	sockaddr ifru_addr;
 		struct	sockaddr ifru_dstaddr;
 		struct	sockaddr ifru_broadaddr;
+		struct	sockaddr ifru_netmask;
 		short	ifru_flags[2];
 		short	ifru_index;
 		int	ifru_metric;
@@ -239,6 +241,7 @@ struct	ifreq {
 #define	ifr_addr	ifr_ifru.ifru_addr	/* address */
 #define	ifr_dstaddr	ifr_ifru.ifru_dstaddr	/* other end of p-to-p link */
 #define	ifr_broadaddr	ifr_ifru.ifru_broadaddr	/* broadcast address */
+#define	ifr_netmask	ifr_ifru.ifru_netmask	/* interface net mask	*/
 #define	ifr_flags	ifr_ifru.ifru_flags[0]	/* flags */
 #define	ifr_prevflags	ifr_ifru.ifru_flags[1]	/* flags */
 #define	ifr_metric	ifr_ifru.ifru_metric	/* metric */
diff --git a/newlib/libc/sys/linux/include/netinet/ip.h b/newlib/libc/sys/linux/include/netinet/ip.h
index 0e6df1eea..2b2bcb831 100644
--- a/newlib/libc/sys/linux/include/netinet/ip.h
+++ b/newlib/libc/sys/linux/include/netinet/ip.h
@@ -37,6 +37,8 @@
 #ifndef _NETINET_IP_H_
 #define _NETINET_IP_H_
 
+#include <netinet/in_systm.h>
+
 /*
  * Definitions for internet protocol version 4.
  * Per RFC 791, September 1981.
diff --git a/newlib/libc/sys/linux/io.c b/newlib/libc/sys/linux/io.c
index d6731144a..25dccc660 100644
--- a/newlib/libc/sys/linux/io.c
+++ b/newlib/libc/sys/linux/io.c
@@ -65,12 +65,12 @@ int flock(int fd,int operation)
 
 #if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3
 
-static _syscall3(int,__mknod,const char *,path,mode_t,mode,dev_t *,dev)
+static _syscall3(int,__mknod,const char *,path,mode_t,mode,dev_t,dev)
 
 int mkfifo(const char *path, mode_t mode)
 {
    dev_t dev = 0;
-   return __mknod(path, mode | S_IFIFO, &dev);
+   return __mknod(path, mode | S_IFIFO, dev);
 }
 #endif
 
diff --git a/newlib/libc/sys/linux/net/name6.c b/newlib/libc/sys/linux/net/name6.c
index 80037e8f9..f220e213c 100644
--- a/newlib/libc/sys/linux/net/name6.c
+++ b/newlib/libc/sys/linux/net/name6.c
@@ -1499,16 +1499,16 @@ _dns_ghbyname(void *rval, void *cb_data, va_list ap)
 #ifdef INET6
 	switch (af) {
 	case AF_UNSPEC:
-		&rtl4->rtl_entry = NULL; rtl4.rtl_type = T_A;
-		&rtl6->rtl_entry = &rtl4; rtl6.rtl_type = T_AAAA;
+		rtl4.rtl_entry = NULL; rtl4.rtl_type = T_A;
+		rtl6.rtl_entry = &rtl4; rtl6.rtl_type = T_AAAA;
 		rtl = &rtl6;
 		break;
 	case AF_INET6:
-		&rtl6->rtl_entry = NULL; rtl6.rtl_type = T_AAAA;
+		rtl6.rtl_entry = NULL; rtl6.rtl_type = T_AAAA;
 		rtl = &rtl6;
 		break;
 	case AF_INET:
-		&rtl4->rtl_entry = NULL; rtl4.rtl_type = T_A;
+		rtl4.rtl_entry = NULL; rtl4.rtl_type = T_A;
 		rtl = &rtl4;
 		break;
 	}
diff --git a/newlib/libc/sys/linux/sys/ioccom.h b/newlib/libc/sys/linux/sys/ioccom.h
index 4a063e973..e656d5ef6 100644
--- a/newlib/libc/sys/linux/sys/ioccom.h
+++ b/newlib/libc/sys/linux/sys/ioccom.h
@@ -67,7 +67,7 @@
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-int	ioctl(int, unsigned long, ...);
+int	ioctl(int __fd, int __request, ...);
 __END_DECLS
 
 #endif