aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-01 08:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-01 08:10:10 +0000
commit25b3dd49a7140508ff17e705408edd80122a4add (patch)
treef55e4b1a272c4993a11c8b592716b1bf05585c71 /sysdeps/unix/sysv
parentbc710b3b7a7c2d94377b023ad9fe46e25c7e3405 (diff)
downloadglibc-25b3dd49a7140508ff17e705408edd80122a4add.zip
glibc-25b3dd49a7140508ff17e705408edd80122a4add.tar.gz
glibc-25b3dd49a7140508ff17e705408edd80122a4add.tar.bz2
Update.
* elf/Versions [ld] (GLIBC_2.2): Export _dl_clktck and _dl_pagesize. * elf/dl-load.c: Define _dl_clktck. * elf/elf.h: Define AT_CLKTCK. * include/time.h: Declare __getclktck. * misc/Makefile (routines): Add getclktck. * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Handle AT_CLKTCK. (_dl_show_auxv): Show AT_CLKTCK value. * sysdeps/generic/getclktck.c: New file. * sysdeps/unix/sysv/linux/getclktck.c: New file. * sysdeps/unix/sysv/linux/alpha/getclktck.c: New file. * sysdeps/unix/sysv/linux/ia64/getclktck.c: New file. * sysdeps/posix/sysconf.c: Use __getclktck to handle _SC_CLK_TCK. * sysdeps/unix/sysv/linux/getpagesize.c: New file. * sysdeps/unix/sysv/linux/bits/time.h: Use __sysconf to for CLK_TCK. * sysdeps/unix/sysv/linux/alpha/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/i386/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/time.h: Likewise. * sysdeps/unix/sysv/linux/s390/bits/time.h: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/alpha/getclktck.c2
-rw-r--r--sysdeps/unix/sysv/linux/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/getclktck.c32
-rw-r--r--sysdeps/unix/sysv/linux/getpagesize.c45
-rw-r--r--sysdeps/unix/sysv/linux/i386/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/time.h3
-rw-r--r--sysdeps/unix/sysv/linux/ia64/getclktck.c2
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/time.h3
9 files changed, 91 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/time.h b/sysdeps/unix/sysv/linux/alpha/bits/time.h
index a0eddbe..b9d9f3f 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/time.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/time.h
@@ -36,7 +36,8 @@
# ifndef __STRICT_ANSI__
/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
presents the real value for clock ticks per second for the system. */
-# define CLK_TCK 1024
+extern long int __sysconf (int);
+# define CLK_TCK (__sysconf (2)) /* 2 is _SC_CLK_TCK */
# endif
# ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/alpha/getclktck.c b/sysdeps/unix/sysv/linux/alpha/getclktck.c
new file mode 100644
index 0000000..6636bbe
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/getclktck.c
@@ -0,0 +1,2 @@
+#define SYSTEM_CLK_TCK 1024
+#include <sysdeps/unix/sysv/linux/getclktck.c>
diff --git a/sysdeps/unix/sysv/linux/bits/time.h b/sysdeps/unix/sysv/linux/bits/time.h
index 886ebb7..a19b2a8 100644
--- a/sysdeps/unix/sysv/linux/bits/time.h
+++ b/sysdeps/unix/sysv/linux/bits/time.h
@@ -36,7 +36,8 @@
# ifndef __STRICT_ANSI__
/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
presents the real value for clock ticks per second for the system. */
-# define CLK_TCK 100
+extern long int __sysconf (int);
+# define CLK_TCK (__sysconf (2)) /* 2 is _SC_CLK_TCK */
# endif
# ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/getclktck.c b/sysdeps/unix/sysv/linux/getclktck.c
new file mode 100644
index 0000000..7936ea4
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/getclktck.c
@@ -0,0 +1,32 @@
+/* Copyright (C) 2000 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <time.h>
+
+#ifndef SYSTEM_CLK_TCK
+# define SYSTEM_CLK_TCK 100
+#endif
+
+/* Return frequency of times(). */
+int
+__getclktck ()
+{
+ extern int _dl_clktck; /* Defined in dl-load.c. */
+
+ return _dl_clktck ?: SYSTEM_CLK_TCK;
+}
diff --git a/sysdeps/unix/sysv/linux/getpagesize.c b/sysdeps/unix/sysv/linux/getpagesize.c
new file mode 100644
index 0000000..3faf4ba
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/getpagesize.c
@@ -0,0 +1,45 @@
+/* Copyright (C) 1991,1992,1995,1996,1997,2000 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 Library General Public License as
+ published by the Free Software Foundation; either version 2 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
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <unistd.h>
+#include <sys/param.h>
+
+/* Return the system page size. */
+int
+__getpagesize ()
+{
+ extern size_t _dl_pagesize;
+
+ if (_dl_pagesize != 0)
+ return _dl_pagesize;
+
+#ifdef EXEC_PAGESIZE
+ return EXEC_PAGESIZE;
+#else /* No EXEC_PAGESIZE. */
+#ifdef NBPG
+#ifndef CLSIZE
+#define CLSIZE 1
+#endif /* No CLSIZE. */
+ return NBPG * CLSIZE;
+#else /* No NBPG. */
+ return NBPC;
+#endif /* NBPG. */
+#endif /* EXEC_PAGESIZE. */
+}
+
+weak_alias (__getpagesize, getpagesize)
diff --git a/sysdeps/unix/sysv/linux/i386/bits/time.h b/sysdeps/unix/sysv/linux/i386/bits/time.h
index 9bda724..3b9e9d3 100644
--- a/sysdeps/unix/sysv/linux/i386/bits/time.h
+++ b/sysdeps/unix/sysv/linux/i386/bits/time.h
@@ -36,7 +36,8 @@
# ifndef __STRICT_ANSI__
/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
presents the real value for clock ticks per second for the system. */
-# define CLK_TCK 100
+extern long int __sysconf (int);
+# define CLK_TCK (__sysconf (2)) /* 2 is _SC_CLK_TCK */
# endif
# ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/time.h b/sysdeps/unix/sysv/linux/ia64/bits/time.h
index cb68abb..636e087 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/time.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/time.h
@@ -36,7 +36,8 @@
# ifndef __STRICT_ANSI__
/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
presents the real value for clock ticks per second for the system. */
-# define CLK_TCK 1024
+extern long int __sysconf (int);
+# define CLK_TCK (__sysconf (2)) /* 2 is _SC_CLK_TCK */
# endif
# ifdef __USE_POSIX199309
diff --git a/sysdeps/unix/sysv/linux/ia64/getclktck.c b/sysdeps/unix/sysv/linux/ia64/getclktck.c
new file mode 100644
index 0000000..6636bbe
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ia64/getclktck.c
@@ -0,0 +1,2 @@
+#define SYSTEM_CLK_TCK 1024
+#include <sysdeps/unix/sysv/linux/getclktck.c>
diff --git a/sysdeps/unix/sysv/linux/s390/bits/time.h b/sysdeps/unix/sysv/linux/s390/bits/time.h
index 0c6ee38..ca223b4 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/time.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/time.h
@@ -36,7 +36,8 @@
# ifndef __STRICT_ANSI__
/* Even though CLOCKS_PER_SEC has such a strange value CLK_TCK
presents the real value for clock ticks per second for the system. */
-# define CLK_TCK 100
+extern long int __sysconf (int);
+# define CLK_TCK (__sysconf (2)) /* 2 is _SC_CLK_TCK */
# endif
# ifdef __USE_POSIX199309