diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sysctl.mk | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/sysctl.mk | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index f8f2bfac81..9212a03716 100644 --- 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 1011509018..70fd137dbc 100644 --- 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 79d5998569..8d04d12e25 100644 --- 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 cdca4ef39a..da018fe624 100644 --- 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 = |