From: David S. Miller <davem@davemloft.net>
Date: Sun, 11 Nov 2012 23:46:01 +0000 (-0800)
Subject: Fix check-localplt regressions on sparc.
X-Git-Tag: upstream/2.20~2973
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=640ac3f1bf2e575b514645fc03cceeeacf7bd845;p=platform%2Fupstream%2Flinaro-glibc.git

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);