Remove $(sysctl) from sysdep_routines

diff --git a/ChangeLog b/ChangeLog
index f8f2bfac81f3695d8edab2cbdbfcd452f525f936..9212a037162bf5246d0134dc8094829ed23d730d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
        * sysdeps/unix/sysv/linux/Makefile: Include
        $(firstword $(wildcard $(sysdirs:=/sysctl.mk))).
-       (sysdep_routines): Replace sysctl with $(sysctl).
+       (sysdep_routines): Remove 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.

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 1011509018ce171da29529238b2fdee6c2c09de9..70fd137dbc2a501d4e0f9a9c7fbd0808a14ec22d 100644 (file)
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -19,7 +19,7 @@ endif
 ifeq ($(subdir),misc)
 include $(firstword $(wildcard $(sysdirs:=/sysctl.mk)))
 
-sysdep_routines += $(sysctl) clone llseek umount umount2 readahead \
+sysdep_routines += clone llseek umount umount2 readahead \
                   setfsuid setfsgid makedev epoll_pwait signalfd \
                   eventfd eventfd_read eventfd_write prlimit
 

diff --git a/sysdeps/unix/sysv/linux/sysctl.mk b/sysdeps/unix/sysv/linux/sysctl.mk
index 79d599856986b4c1316f3654358b6a3aba928d84..8d04d12e25a701637fef6ef953894f02b2a9a68b 100644 (file)
--- a/sysdeps/unix/sysv/linux/sysctl.mk
+++ b/sysdeps/unix/sysv/linux/sysctl.mk
@@ -1,3 +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
+# compatility.  New target shouldn't add it (see x86_64/x32/sysctl.mk).
+sysdep_routines += sysctl

diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk
index cdca4ef39ae1d31a40397151c43e14a7fcb91ab5..da018fe624011e55b09db7102597d3f5415144f5 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk
@@ -1,2 +1 @@
 # X32 doesn't support sysctl.
-sysctl =