From c9009328789acfca816c5ea0337ce0d0479b8fe5 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 22 May 2012 13:46:29 -0700 Subject: [PATCH] Add sysctl.mk and bits/sysctl.h --- ChangeLog | 11 +++++++++++ sysdeps/unix/sysv/linux/Makefile | 4 +++- sysdeps/unix/sysv/linux/bits/sysctl.h | 1 + sysdeps/unix/sysv/linux/sys/sysctl.h | 2 ++ sysdeps/unix/sysv/linux/sysctl.mk | 3 +++ sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h | 20 ++++++++++++++++++++ sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk | 2 ++ 7 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/sysv/linux/bits/sysctl.h create mode 100644 sysdeps/unix/sysv/linux/sysctl.mk create mode 100644 sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h create mode 100644 sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk diff --git a/ChangeLog b/ChangeLog index 8206ea4..f8f2bfa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2012-05-22 H.J. Lu + + * sysdeps/unix/sysv/linux/Makefile: Include + $(firstword $(wildcard $(sysdirs:=/sysctl.mk))). + (sysdep_routines): Replace sysctl with $(sysctl). + * sysdeps/unix/sysv/linux/bits/sysctl.h: New file. + * sysdeps/unix/sysv/linux/sysctl.mk: Likewise. + * sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h: Likewise. + * sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk: Likewise. + * sysdeps/unix/sysv/linux/sys/sysctl.h: Include . + 2012-05-22 Andreas Jaeger * sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S: Rearrange code so diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 120d544..1011509 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 0000000..81447b2 --- /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 2c2d688..cfa71ad 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 + __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 0000000..79d5998 --- /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 0000000..520ccb9 --- /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 + . */ + +#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 0000000..cdca4ef --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk @@ -0,0 +1,2 @@ +# X32 doesn't support sysctl. +sysctl = -- 2.7.4