diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-22 13:46:29 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-22 13:46:29 -0700 |
commit | c9009328789acfca816c5ea0337ce0d0479b8fe5 (patch) | |
tree | bee640926975bfb0cc7d03cdec0122b3f5d5eea4 /sysdeps/unix | |
parent | 73338355920056d87648c65ccba9a875c289b37e (diff) | |
download | glibc-c9009328789acfca816c5ea0337ce0d0479b8fe5.tar.gz glibc-c9009328789acfca816c5ea0337ce0d0479b8fe5.tar.xz glibc-c9009328789acfca816c5ea0337ce0d0479b8fe5.zip |
Add sysctl.mk and bits/sysctl.h
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/sysctl.h | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/sysctl.h | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/sysctl.mk | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h | 20 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk | 2 |
6 files changed, 31 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 120d544289..1011509018 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -17,7 +17,9 @@ sysdep_routines += internal_accept4 recvmmsg internal_recvmmsg sendmmsg \ endif ifeq ($(subdir),misc) -sysdep_routines += sysctl clone llseek umount umount2 readahead \ +include $(firstword $(wildcard $(sysdirs:=/sysctl.mk))) + +sysdep_routines += $(sysctl) clone llseek umount umount2 readahead \ setfsuid setfsgid makedev epoll_pwait signalfd \ eventfd eventfd_read eventfd_write prlimit diff --git a/sysdeps/unix/sysv/linux/bits/sysctl.h b/sysdeps/unix/sysv/linux/bits/sysctl.h new file mode 100644 index 0000000000..81447b2f74 --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/sysctl.h @@ -0,0 +1 @@ +/* Empty file. */ diff --git a/sysdeps/unix/sysv/linux/sys/sysctl.h b/sysdeps/unix/sysv/linux/sys/sysctl.h index 2c2d688198..cfa71ad27b 100644 --- a/sysdeps/unix/sysv/linux/sys/sysctl.h +++ b/sysdeps/unix/sysv/linux/sys/sysctl.h @@ -60,6 +60,8 @@ # undef __undef__LINUX_COMPILER_H #endif +#include <bits/sysctl.h> + __BEGIN_DECLS /* Read or write system parameters. */ diff --git a/sysdeps/unix/sysv/linux/sysctl.mk b/sysdeps/unix/sysv/linux/sysctl.mk new file mode 100644 index 0000000000..79d5998569 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sysctl.mk @@ -0,0 +1,3 @@ +# sysctl system call has been deprecated. It is provided for backward +# compatility. New target should override it (see x86_64/x32/sysctl.mk). +sysctl = sysctl diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h b/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h new file mode 100644 index 0000000000..520ccb97e6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h @@ -0,0 +1,20 @@ +/* Copyright (C) 2012 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#if defined __x86_64__ && defined __ILP32__ +# error "sysctl system call is unsupported in x32 kernel" +#endif diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk new file mode 100644 index 0000000000..cdca4ef39a --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk @@ -0,0 +1,2 @@ +# X32 doesn't support sysctl. +sysctl = |