This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-665-g640ac3f
- From: davem at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Nov 2012 23:59:35 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-665-g640ac3f
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 640ac3f1bf2e575b514645fc03cceeeacf7bd845 (commit)
from 7e2bd01fcf3c481b7ed3405d9cee69d6f9f7b1f5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=640ac3f1bf2e575b514645fc03cceeeacf7bd845
commit 640ac3f1bf2e575b514645fc03cceeeacf7bd845
Author: David S. Miller <davem@davemloft.net>
Date: Sun Nov 11 15:46:01 2012 -0800
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.
diff --git a/ChangeLog b/ChangeLog
index 936b8ca..ba9ecf3 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 cb31e5c..2c9812e 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);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
.../unix/sysv/linux/sparc/sparc64/get_clockfreq.c | 9 +++++----
2 files changed, 12 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources