about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/Dist1
-rw-r--r--sysdeps/unix/sysv/linux/Makefile2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/kernel_termios.h2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/bits/in.h6
-rw-r--r--sysdeps/unix/sysv/linux/getcwd.c2
-rw-r--r--sysdeps/unix/sysv/linux/net/if_arp.h8
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/bits/termios.h4
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/termios.h17
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/sys/module.h61
11 files changed, 20 insertions, 87 deletions
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 70baab50ee..340f8c641b 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -39,7 +39,6 @@ sys/io.h
 sys/kd.h
 sys/kdaemon.h
 sys/klog.h
-sys/module.h
 sys/mount.h
 sys/mtio.h
 sys/prctl.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 7331b38588..253bc26e94 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -12,7 +12,7 @@ ifeq ($(subdir),misc)
 sysdep_routines += sysctl clone llseek
 
 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h sys/mtio.h \
-		  sys/module.h sys/io.h sys/klog.h sys/kdaemon.h \
+		  sys/io.h sys/klog.h sys/kdaemon.h \
 		  sys/user.h sys/sysmacros.h sys/procfs.h sys/prctl.h \
 		  sys/debugreg.h sys/kd.h sys/soundcard.h sys/vt.h \
 		  sys/quota.h sys/fsuid.h bits/mman.h \
diff --git a/sysdeps/unix/sysv/linux/alpha/kernel_termios.h b/sysdeps/unix/sysv/linux/alpha/kernel_termios.h
index 093ac25096..6a99146b5a 100644
--- a/sysdeps/unix/sysv/linux/alpha/kernel_termios.h
+++ b/sysdeps/unix/sysv/linux/alpha/kernel_termios.h
@@ -22,7 +22,7 @@
 /* The following corresponds to the values from the Linux 2.1.20 kernel.  */
 
 /* We need the definition of tcflag_t, cc_t, and speed_t.  */
-#include <bits/termios.h>
+#include <termios.h>
 
 #define __KERNEL_NCCS 19
 
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index 9e4cd39a8f..d3bc033b3d 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -20,7 +20,7 @@ osf_sigprocmask	-	osf_sigprocmask	2	__osf_sigprocmask
 getpeername	-	getpeername	3	__getpeername	getpeername
 getpriority	-	getpriority	2	__getpriority	getpriority
 mmap		-	mmap		6	__mmap		mmap
-llseek		EXTRA	lseek		3	llseek
+llseek		EXTRA	lseek		3	__llseek	llseek lseek64
 pread		EXTRA	pread		4	__pread		pread __pread64 pread64
 pwrite		EXTRA	pwrite		4	__pwrite	pwrite __pwrite64 pwrite64
 
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
index 1d3817f68d..bfa7aae571 100644
--- a/sysdeps/unix/sysv/linux/bits/in.h
+++ b/sysdeps/unix/sysv/linux/bits/in.h
@@ -57,8 +57,10 @@ struct ip_mreq
 /* IPV6 socket options.  */
 #define IPV6_ADDRFORM		1
 #define IPV6_PKTINFO		2
-#define IPV6_RXHOPOPTS		3
-#define IPV6_RXDSTOPTS		4
+#define IPV6_RXHOPOPTS		3 /* obsolete name */
+#define IPV6_RXDSTOPTS		4 /* obsolete name */
+#define IPV6_HOPOPTS		IPV6_RXHOPOPTS  /* new name */
+#define IPV6_DSTOPTS		IPV6_RXDSTOPTS  /* new name */
 #define IPV6_RXSRCRT		5
 #define IPV6_PKTOPTIONS		6
 #define IPV6_CHECKSUM		7
diff --git a/sysdeps/unix/sysv/linux/getcwd.c b/sysdeps/unix/sysv/linux/getcwd.c
index f3406d7916..ed649f8fef 100644
--- a/sysdeps/unix/sysv/linux/getcwd.c
+++ b/sysdeps/unix/sysv/linux/getcwd.c
@@ -110,6 +110,6 @@ __getcwd (char *buf, size_t size)
 weak_alias (__getcwd, getcwd)
 
 /* Get the code for the generic version.  */
-#define GETCWD_STORAGE_CLASS	static internal_function
+#define GETCWD_RETURN_TYPE	static char * internal_function
 #define __getcwd		generic_getcwd
 #include <sysdeps/posix/getcwd.c>
diff --git a/sysdeps/unix/sysv/linux/net/if_arp.h b/sysdeps/unix/sysv/linux/net/if_arp.h
index 80f4516344..efb0c84e5d 100644
--- a/sysdeps/unix/sysv/linux/net/if_arp.h
+++ b/sysdeps/unix/sysv/linux/net/if_arp.h
@@ -92,7 +92,6 @@ struct arphdr
 #define ARPHRD_PPP	512
 #define ARPHRD_HDLC	513		/* (Cisco) HDLC.  */
 #define ARPHRD_LAPB	516		/* LAPB.  */
-#define ARPHRD_ASH	517		/* ASH.  */
 
 #define ARPHRD_TUNNEL	768		/* IPIP tunnel.  */
 #define ARPHRD_TUNNEL6	769		/* IPIP6 tunnel.  */
@@ -101,8 +100,13 @@ struct arphdr
 #define ARPHRD_LOOPBACK	772		/* Loopback device.  */
 #define ARPHRD_LOCALTLK 773		/* Localtalk device.  */
 #define ARPHRD_FDDI	774		/* Fiber Distributed Data Interface. */
-#define ARPHRD_BIF      775             /* AP1000 BIF.  */
+#define ARPHRD_BIF	775             /* AP1000 BIF.  */
 #define ARPHRD_SIT	776		/* sit0 device - IPv6-in-IPv4.  */
+#define ARPHRD_IPDDP	777		/* IP-in-DDP tunnel.  */
+#define ARPHRD_IPGRE	778		/* GRE over IP.  */
+#define ARPHRD_PIMREG	779		/* PIMSM register interface.  */
+#define ARPHRD_HIPPI	780		/* High Performance Parallel I'face. */
+#define ARPHRD_ASH	781		/* (Nexus Electronics) Ash.  */
 
 
 /* ARP ioctl request.  */
diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
index d1a40be33c..1bd2b159e8 100644
--- a/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/termios.h
@@ -74,8 +74,8 @@ struct termios {
 #define ICRNL	0000400
 #define IXON	0001000
 #define IXOFF	0002000
-#if !defined KERNEL || defined __USE_BSD
-  /* POSIX.1 doesn't want these... */
+/* POSIX.1 doesn't want these... */
+#ifdef __USE_BSD
 # define IXANY		0004000
 # define IUCLC		0010000
 # define IMAXBEL	0020000
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/termios.h b/sysdeps/unix/sysv/linux/sparc/bits/termios.h
index 7047e47a02..c797f49a84 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/termios.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/termios.h
@@ -34,10 +34,6 @@ struct termios
     tcflag_t c_lflag;		/* local mode flags */
     cc_t c_line;		/* line discipline */
     cc_t c_cc[NCCS];		/* control characters */
-#ifdef __KERNEL__
-# define SIZEOF_USER_TERMIOS sizeof (struct termios) - (2*sizeof (cc_t))
-    cc_t _x_cc[2];		/* We need them to hold vmin/vtime */
-#endif
   };
 
 /* c_cc characters */
@@ -61,16 +57,9 @@ struct termios
 #define VWERASE  14
 #define VLNEXT   15
 
-/* Kernel keeps vmin/vtime separated, user apps assume vmin/vtime is
- * shared with eof/eol
- */
-#ifdef __KERNEL__
-# define VMIN     16
-# define VTIME    17
-#else
-# define VMIN     VEOF
-# define VTIME    VEOL
-#endif
+/* User apps assume vmin/vtime is shared with eof/eol */
+#define VMIN     VEOF
+#define VTIME    VEOL
 
 /* c_iflag bits */
 #define IGNBRK	0x00000001
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
index d0bee8fa07..6491a9ccac 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
@@ -1,7 +1,7 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
 # Whee! 64-bit systems naturally implement llseek.
-llseek		EXTRA	lseek		3	llseek
+llseek		EXTRA	lseek		3	__llseek	llseek lseek64
 pread		EXTRA	pread		4	__pread		pread __pread64 pread64
 pwrite		EXTRA	pwrite		4	__pwrite	pwrite __pwrite64 pwrite64
 
diff --git a/sysdeps/unix/sysv/linux/sys/module.h b/sysdeps/unix/sysv/linux/sys/module.h
deleted file mode 100644
index 0b47da29e7..0000000000
--- a/sysdeps/unix/sysv/linux/sys/module.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* Copyright (C) 1996 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.  */
-
-#ifndef	_SYS_MODULE_H
-
-#define	_SYS_MODULE_H	1
-#include <features.h>
-
-#define __need_size_t
-#include <stddef.h>
-
-#include <linux/module.h>
-
-__BEGIN_DECLS
-
-/* Return number of kernel symbols if TABLE == NULL, otherwise, return
-   kernel symbols in TABLE.  TABLE must be large enough to hold all
-   kernel symbols.  */
-extern int get_kernel_syms __P ((struct kernel_sym *__table));
-
-/* Create a new module of name MODULE_NAME and of size SIZE bytes.
-   The return address is the starting address of the new module or -1L
-   if the module cannot be created (the return value needs to be cast
-   to (long) to detect the error condition).  */
-extern unsigned long int create_module __P ((__const char *__module_name,
-					     size_t __size));
-
-/* Initialize the module called MODULE_NAME with the CONTENTSSIZE
-   bytes starting at address CONTENTS.  CONTENTS normally contains the
-   text and data segment of the module (the bss is implicitly zeroed).
-   After copying the contents, the function pointed to by
-   ROUTINES.init is executed.  When the module is no longer needed,
-   ROUTINES.cleanup is executed.  SYMTAB is NULL if the module does
-   not want to export symbols by itself, or a pointer to a symbol
-   table if the module wants to register its own symbols.  */
-extern int init_module __P ((__const char *__module_name,
-			     __const void *__contents, size_t __contentssize,
-			     struct mod_routines *__routines,
-			     struct symbol_table *__symtab));
-
-/* Delete the module named MODULE_NAME from the kernel.  */
-extern int delete_module __P ((__const char *__module_name));
-
-__END_DECLS
-
-#endif /* sys/module.h */