summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-11-11 15:46:01 -0800
committerDavid S. Miller <davem@davemloft.net>2012-11-11 15:46:01 -0800
commit640ac3f1bf2e575b514645fc03cceeeacf7bd845 (patch)
tree4c3de6456639c84e905526ef9ae68219932996cd
parent7e2bd01fcf3c481b7ed3405d9cee69d6f9f7b1f5 (diff)
downloadglibc-640ac3f1bf2e575b514645fc03cceeeacf7bd845.tar.gz
Fix check-localplt regressions on sparc.
* sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Include inttypes.h (__get_clockfreq_via_proc_openprom): Use __open, __read, and __close rather than their public counterparts.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c9
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 936b8cae35..ba9ecf3072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-11 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Include
+ inttypes.h
+ (__get_clockfreq_via_proc_openprom): Use __open, __read, and
+ __close rather than their public counterparts.
+
2012-11-10 Joseph Myers <joseph@codesourcery.com>
* conform/data/semaphore.h-data [XPG3 || XPG4]: Disable whole
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
index cb31e5ca2e..2c9812e4b4 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
@@ -22,6 +22,7 @@
#include <unistd.h>
#include <dirent.h>
#include <stdlib.h>
+#include <inttypes.h>
#include <sys/ioctl.h>
#include <libc-internal.h>
#include <asm/openpromio.h>
@@ -123,14 +124,14 @@ __get_clockfreq_via_proc_openprom (void)
int clkfreq_fd;
__stpcpy (prop, "/clock-frequency");
- clkfreq_fd = open (node, O_RDONLY);
+ clkfreq_fd = __open (node, O_RDONLY);
if (clkfreq_fd != -1)
{
- if (read (clkfreq_fd, type_string,
- sizeof (type_string)) > 0)
+ if (__read (clkfreq_fd, type_string,
+ sizeof (type_string)) > 0)
result = (hp_timing_t)
strtoumax (type_string, NULL, 16);
- close (clkfreq_fd);
+ __close (clkfreq_fd);
}
}
__close (fd);