From 1f3109a5f8b7facf9fa655ce48da3be0767141cd Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 24 Jan 2001 08:48:10 +0000 Subject: [PATCH] Update. 2001-01-24 Andreas Jaeger * sysdeps/unix/sysv/linux/init-first.c: Remove extra __sysctl prototype. * sysdeps/unix/sysv/linux/dl-osinfo.h: Likewise. * include/sys/sysctl.h: New. * stdlib/Makefile ($(objpfx)isomac.out): Also pass sysincludes to isomac. --- ChangeLog | 11 ++++++++++- include/sys/sysctl.h | 9 +++++++++ sysdeps/unix/sysv/linux/dl-osinfo.h | 7 +------ sysdeps/unix/sysv/linux/init-first.c | 6 +----- 4 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 include/sys/sysctl.h diff --git a/ChangeLog b/ChangeLog index cc556bf..d2e2e1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,15 @@ +2001-01-24 Andreas Jaeger + + * sysdeps/unix/sysv/linux/init-first.c: Remove extra __sysctl + prototype. + * sysdeps/unix/sysv/linux/dl-osinfo.h: Likewise. + + * include/sys/sysctl.h: New. + 2001-01-23 Andreas Jaeger - * stdlib/Makefile ($(objpfx)isomac.out): Also pass sysincludes to isomac. + * stdlib/Makefile ($(objpfx)isomac.out): Also pass sysincludes to + isomac. * elf/dl-load.c (_dl_init_paths): Don't use strdupa in function arguments. Reported by Jiri Kubicek , diff --git a/include/sys/sysctl.h b/include/sys/sysctl.h new file mode 100644 index 0000000..db8e08d --- /dev/null +++ b/include/sys/sysctl.h @@ -0,0 +1,9 @@ +#ifndef _SYS_SYSCTL_H +#include_next + +/* Read or write system parameters (Linux specific). */ +extern int __sysctl (int *__name, int __nlen, void *__oldval, + size_t *__oldlenp, void *__newval, size_t __newlen); + + +#endif /* _SYS_SYSCTL_H */ diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h index 1a94d17..2d705b0 100644 --- a/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -1,5 +1,5 @@ /* Operating system specific code for generic dynamic loader functions. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2001 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 @@ -26,11 +26,6 @@ # define MIN(a,b) (((a)<(b))?(a):(b)) #endif -/* There is no prototype for __sysctl in that file. */ -extern int __sysctl (int *name, int nlen, void *oldval, - size_t *oldlenp, void *newval, size_t newlen); - - #ifdef SHARED /* This is the function used in the dynamic linker to print the fatal error message. */ diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index af4e9c6..512a696 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. Linux version. - Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001 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 @@ -37,10 +37,6 @@ extern void __libc_init (int, char **, char **); /* The function is called from assembly stubs the compiler can't see. */ static void init (int, char **, char **) __attribute__ ((unused)); -/* The function we use to get the kernel revision. */ -extern int __sysctl (int *name, int nlen, void *oldval, size_t *oldlenp, - void *newval, size_t newlen); - extern int _dl_starting_up; weak_extern (_dl_starting_up) -- 2.7.4