diff options
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/confname.h | 1 | ||||
| -rw-r--r-- | sysdeps/posix/sysconf.c | 15 | ||||
| -rw-r--r-- | sysdeps/stub/sysconf.c | 48 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/configure | 25 |
4 files changed, 69 insertions, 20 deletions
diff --git a/sysdeps/generic/confname.h b/sysdeps/generic/confname.h index 3bc6b27652..fb2679fb45 100644 --- a/sysdeps/generic/confname.h +++ b/sysdeps/generic/confname.h @@ -112,6 +112,7 @@ enum #define _SC_VERSION _SC_VERSION _SC_PAGESIZE, #define _SC_PAGESIZE _SC_PAGESIZE +#define _SC_PAGE_SIZE _SC_PAGESIZE _SC_RTSIG_MAX, #define _SC_RTSIG_MAX _SC_RTSIG_MAX _SC_SEM_NSEMS_MAX, diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index f0dbc23606..dda72a3591 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> #include <errno.h> #include <limits.h> #include <unistd.h> @@ -24,12 +23,13 @@ Cambridge, MA 02139, USA. */ #include <stdio.h> #include <time.h> -extern int EXFUN(__getdtablesize, (NOARGS)); -extern size_t EXFUN(__getpagesize, (NOARGS)); +extern int __getdtablesize __P ((void)); +extern size_t __getpagesize __P ((void)); /* Get the value of the system variable NAME. */ long int -DEFUN(__sysconf, (name), int name) +__sysconf (name) + int name; { switch (name) { @@ -301,6 +301,13 @@ DEFUN(__sysconf, (name), int name) return -1; #endif + case _SC_COLL_WEIGHTS_MAX: +#ifdef COLL_WEIGHTS_MAX + return COLL_WEIGHTS_MAX; +#else + return -1; +#endif + case _SC_EQUIV_CLASS_MAX: #ifdef EQUIV_CLASS_MAX return EQUIV_CLASS_MAX; diff --git a/sysdeps/stub/sysconf.c b/sysdeps/stub/sysconf.c index 816724ef52..f3b0c352ca 100644 --- a/sysdeps/stub/sysconf.c +++ b/sysdeps/stub/sysconf.c @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <ansidecl.h> #include <errno.h> #include <unistd.h> #include <time.h> @@ -25,7 +24,8 @@ Cambridge, MA 02139, USA. */ /* Get the value of the system variable NAME. */ long int -DEFUN(__sysconf, (name), int name) +__sysconf (name) + int name; { switch (name) { @@ -36,11 +36,40 @@ DEFUN(__sysconf, (name), int name) case _SC_TZNAME_MAX: return __tzname_max (); + case _SC_CHARCLASS_NAME_MAX: +#ifdef CHARCLASS_NAME_MAX + return CHARCLASS_NAME_MAX; +#else + return -1; +#endif + + case _SC_COLL_WEIGHTS_MAX: +#ifdef COLL_WEIGHTS_MAX + return COLL_WEIGHTS_MAX; +#else + return -1; +#endif + + case _SC_EQUIV_CLASS_MAX: +#ifdef EQUIV_CLASS_MAX + return EQUIV_CLASS_MAX; +#else + return -1; +#endif + + case _SC_2_LOCALEDEF: +#ifdef _POSIX2_LOCALEDEF + return _POSIX2_LOCALEDEF; +#else + return -1; +#endif + case _SC_ARG_MAX: case _SC_CHILD_MAX: case _SC_CLK_TCK: case _SC_NGROUPS_MAX: case _SC_OPEN_MAX: + case _SC_STREAM_MAX: case _SC_JOB_CONTROL: case _SC_SAVED_IDS: case _SC_REALTIME_SIGNALS: @@ -57,7 +86,20 @@ DEFUN(__sysconf, (name), int name) case _SC_MESSAGE_PASSING: case _SC_SEMAPHORES: case _SC_SHARED_MEMORY_OBJECTS: + + case _SC_AIO_LIST_MAX: + case _SC_AIO_MAX: + case _SC_AIO_PRIO_DELTA_MAX: + case _SC_DELAYTIME_MAX: + case _SC_MQ_OPEN_MAX: + case _SC_MQ_PRIO_MAX: case _SC_VERSION: + case _SC_PAGESIZE: + case _SC_RTSIG_MAX: + case _SC_SEM_NSEMS_MAX: + case _SC_SEM_VALUE_MAX: + case _SC_SIGQUEUE_MAX: + case _SC_TIMER_MAX: case _SC_PII: case _SC_PII_XTI: @@ -77,11 +119,9 @@ DEFUN(__sysconf, (name), int name) case _SC_BC_DIM_MAX: case _SC_BC_SCALE_MAX: case _SC_BC_STRING_MAX: - case _SC_EQUIV_CLASS_MAX: case _SC_EXPR_NEST_MAX: case _SC_LINE_MAX: case _SC_RE_DUP_MAX: - case _SC_CHARCLASS_NAME_MAX: case _SC_2_VERSION: case _SC_2_C_BIND: case _SC_2_C_DEV: diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index fd72c092ad..51b50f9be6 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -8,7 +8,7 @@ test $stdio = default && stdio=libio inhibit_glue=yes echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6 -if eval "test \"`echo '$''{'libc_cv_linux201'+set}'`\" = set"; then +if eval "test \"`echo '$''{'libc_cv_linux203'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF @@ -17,28 +17,29 @@ else #include <linux/version.h> int main() { return 0; } int t() { -#if LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 1) /* 2.0.1 */ +#if LINUX_VERSION_CODE < (2 *65536+ 0 *256+ 3) /* 2.0.3 */ eat flaming death #endif ; return 0; } EOF if { (eval echo configure:26: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - libc_cv_linux201='2.0.1 or later' + libc_cv_linux203='2.0.3 or later' else rm -rf conftest* - libc_cv_linux201='TOO OLD!' + libc_cv_linux203='TOO OLD!' fi rm -f conftest* fi -echo "$ac_t""$libc_cv_linux201" 1>&6 -if test "$libc_cv_linux201" != '2.0.1 or later'; then - { echo "configure: error: GNU libc requires kernel header files from Linux 2.0.1 -or later to be installed before configuring. The kernel header files -are found usually in /usr/include/asm and /usr/include/linux; make sure -these directories use files from Linux 2.0.1 or later. This check uses -<linux/version.h>, so make sure that file was built correctly when -installing the kernel header files." 1>&2; exit 1; } +echo "$ac_t""$libc_cv_linux203" 1>&6 +if test "$libc_cv_linux203" != '2.0.3 or later'; then + { echo "configure: error: GNU libc requires kernel header files from +Linux 2.0.3 or later to be installed before configuring. +The kernel header files are found usually in /usr/include/asm and +/usr/include/linux; make sure these directories use files from +Linux 2.0.3 or later. This check uses <linux/version.h>, so +make sure that file was built correctly when installing the kernel header +files." 1>&2; exit 1; } fi |