8 files changed, 97 insertions, 3 deletions
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index d6124bd2ba..e6505c0ed9 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -1,3 +1,4 @@
 sys/socketcall.h
+sys/sysctl.h
 sys/timex.h
 nfs/nfs.h
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index c33a1906bf..4d484ab092 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -15,7 +15,7 @@ sysdep_routines += fxstat lxstat xstat
 endif
 
 ifeq ($(subdir), misc)
-sysdep_routines += xmknod s_ptrace
+sysdep_routines += xmknod s_ptrace s_sysctl sysctl
 headers += sys/mount.h
 endif
 
@@ -36,4 +36,3 @@ rtld-installed-name = ld-gnu.so.1
 
 # Don't compile the ctype glue code, since there is no old non-GNU C library.
 inhibit-glue = yes
-
diff --git a/sysdeps/unix/sysv/linux/sys/mman.h b/sysdeps/unix/sysv/linux/sys/mman.h
index 33361549f9..5c59095bbe 100644
--- a/sysdeps/unix/sysv/linux/sys/mman.h
+++ b/sysdeps/unix/sysv/linux/sys/mman.h
@@ -1,5 +1,5 @@
 /* Definitions for BSD-style memory management.  Linux version.
-Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 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
@@ -88,6 +88,14 @@ int mlock __P ((__caddr_t __addr, size_t __len));
 /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN).  */
 int munlock __P ((__caddr_t __addr, size_t __len));
 
+/* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length
+   NEW_LEN.  If MAY_MOVE is MREMAP_MAXMOVE the returned address may
+   differ from ADDR.  */
+__caddr_t __mremap __P ((__caddr_t __addr, size_t __old_len, size_t __new_len,
+			 int __may_move));
+__caddr_t mremap __P ((__caddr_t __addr, size_t __old_len, size_t __new_len,
+		       int __may_move));
+
 __END_DECLS
 
 
diff --git a/sysdeps/unix/sysv/linux/sys/socket.h b/sysdeps/unix/sysv/linux/sys/socket.h
new file mode 100644
index 0000000000..b3e8fe85e9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sys/socket.h
@@ -0,0 +1,2 @@
+#include <linux/socket.h>
+#include <linux/socket.h>
diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h
new file mode 100644
index 0000000000..1ec768f898
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sys/sysctl.h
@@ -0,0 +1,36 @@
+/* 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_SYSCTL_H
+#define	_SYS_SYSCTL_H	1
+
+#include <features.h>
+
+__BEGIN_DECLS
+
+#define __need_size_t
+#include <stddef.h>
+#include <linux/sysctl.h>
+
+/* Read or write system parameters.  */
+extern int sysctl __P ((int *__name, int __nlen, void *__oldval,
+			size_t *__oldlenp, void *__newval, size_t __newlen));
+
+__END_DECLS
+
+#endif	/* sys/sysctl.h */
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 42d3e7ef89..6deee5950f 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -13,6 +13,7 @@ ipc		msgget	ipc		5	__ipc
 mlock		-	mlock		2	__mlock	mlock
 mlockall	-	mlockall	1	__mlockall	mlockall
 mount		-	mount		5	__mount	mount
+mremap		-	mremap		4	__mremap	mremap
 munlock		-	munlock		2	__munlock	munlock
 munlockall	-	munlockall	0	__munlockall	munlockall
 nanosleep	-	nanosleep	2	nanosleep
@@ -32,5 +33,6 @@ sched_rr_gi	-	sched_rr_get_interval	2	__sched_rr_get_interval	sched_rr_get_inter
 setpgid		-	setpgid		2	setpgid
 sigpending	-	sigpending	1	sigpending
 sigprocmask	-	sigprocmask	3	__sigprocmask	sigprocmask
+s_sysctl	sysctl	_sysctl		1	__syscall__sysctl
 umount		-	umount		1	__umount	umount
 wait4		-	wait4		4	__wait4		wait4
diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c
index 33640c5871..d658165b07 100644
--- a/sysdeps/unix/sysv/linux/sysconf.c
+++ b/sysdeps/unix/sysv/linux/sysconf.c
@@ -251,6 +251,12 @@ DEFUN(__sysconf, (name), int name)
       return -1;
 #endif
 
+    case _SC_CHARCLASS_NAME_MAX:
+#ifdef	CHARCLASS_NAME_MAX
+      return CHARCLASS_NAME_MAX;
+#else
+      return -1;
+#endif
 
     case _SC_2_VERSION:
       /* This is actually supposed to return the version
diff --git a/sysdeps/unix/sysv/linux/sysctl.c b/sysdeps/unix/sysv/linux/sysctl.c
new file mode 100644
index 0000000000..d2a0b2b4e4
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sysctl.c
@@ -0,0 +1,40 @@
+/* sysctl - Read or write system information.  Linux version.
+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.  */
+
+#include <sys/sysctl.h>
+
+
+extern int __syscall__sysctl (struct __sysctl_args *args);
+
+int
+sysctl (int *name, int nlen, void *oldval, size_t *oldlenp,
+	void *newval, size_t newlen)
+{
+  struct __sysctl_args args =
+  {
+    name: name,
+    nlen: nlen,
+    oldval: oldval,
+    oldlenp: oldlenp,
+    newval: newval,
+    newlen: newlen
+  };
+
+  return __syscall__sysctl (&args);
+}