This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: PATCH: Add x32 dummy sysctl


On Tue, May 22, 2012 at 12:54 PM, Roland McGrath <roland@hack.frob.com> wrote:
>> ? ? ? * sysdeps/unix/sysv/linux/Makefile: Include
>> ? ? ? $(firstword $(wildcard $(sysdirs:=/sysctl.mk))).
>> ? ? ? (sysdep_routines): Replace sysctl with $(sysctl).
>>
>> ? ? ? * sysdeps/unix/sysv/linux/sysctl.mk: New file.
>> ? ? ? * sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h: Likewise.
>> ? ? ? * sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk: Likewise.
>
> No blank line between these.
>
>> --- /dev/null
>> +++ b/sysdeps/unix/sysv/linux/x86_64/sys/sysctl.h
>
> Don't duplicate the whole file. ?Instead split out a bits/sysctl.h,
> whose generic (i.e. sysdeps/unix/sysv/linux) version could be empty
> except for boilerplate.
>

Like this?

Thanks.

-- 
H.J.
---
	* 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 <bits/sysctl.h>.

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 <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 0000000..ac407a6
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sysctl.mk
@@ -0,0 +1,3 @@
+ifeq ($(subdir),misc)
+sysctl = sysctl
+endif
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
+   <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 0000000..e939081
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk
@@ -0,0 +1,4 @@
+# X32 doesn't support sysctl.
+ifeq ($(subdir),misc)
+sysctl =
+endif


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]