diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-10-24 14:50:46 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-10-24 14:50:46 -0700 |
| commit | 6e6249d0b461b952d0f544792372663feb6d792a (patch) | |
| tree | 555d1ac3a5e2ca9030d15f2e1760aea1a2e69ba7 /sysdeps/unix/sysv/linux/i386 | |
| parent | 0cae3f4b033e441d820f4521fa5736e4e6e4d713 (diff) | |
| download | glibc-6e6249d0b461b952d0f544792372663feb6d792a.tar glibc-6e6249d0b461b952d0f544792372663feb6d792a.tar.gz glibc-6e6249d0b461b952d0f544792372663feb6d792a.tar.bz2 glibc-6e6249d0b461b952d0f544792372663feb6d792a.zip | |
BZ#14743: Move clock_* symbols from librt to libc.
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/get_clockfreq.c | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/nptl/libc.abilist | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/get_clockfreq.c b/sysdeps/unix/sysv/linux/i386/get_clockfreq.c index 821e35e4c2..920b0d553e 100644 --- a/sysdeps/unix/sysv/linux/i386/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/i386/get_clockfreq.c @@ -1,5 +1,5 @@ /* Get frequency of the system processor. i386/Linux version. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000-2012 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 @@ -39,7 +39,7 @@ __get_clockfreq (void) if (result != 0) return result; - fd = open ("/proc/cpuinfo", O_RDONLY); + fd = __open ("/proc/cpuinfo", O_RDONLY); if (__builtin_expect (fd != -1, 1)) { /* XXX AFAIK the /proc filesystem can generate "files" only up @@ -47,7 +47,7 @@ __get_clockfreq (void) char buf[4096]; ssize_t n; - n = read (fd, buf, sizeof buf); + n = __read (fd, buf, sizeof buf); if (__builtin_expect (n, 1) > 0) { char *mhz = memmem (buf, n, "cpu MHz", 7); @@ -83,7 +83,7 @@ __get_clockfreq (void) } } - close (fd); + __close (fd); } return result; diff --git a/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist b/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist index 0e8576fdd5..67d592959b 100644 --- a/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/nptl/libc.abilist @@ -1813,6 +1813,11 @@ GLIBC_2.16 timespec_get F GLIBC_2.17 GLIBC_2.17 A + clock_getcpuclockid F + clock_getres F + clock_gettime F + clock_nanosleep F + clock_settime F secure_getenv F GLIBC_2.2 GLIBC_2.2 A |