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.17-779-g89fb683
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Jun 2013 05:47:45 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-779-g89fb683
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 89fb6835583088059b8d8987c86caac33e37e5ea (commit)
from b8c61b4b1d6afb69190169764c1b141f4659e48b (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=89fb6835583088059b8d8987c86caac33e37e5ea
commit 89fb6835583088059b8d8987c86caac33e37e5ea
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Tue Jun 11 11:11:11 2013 +0530
Fix symbol definitions for __clock_* functions
__clock_gettime and other __clock_* functions could result in an extra
PLT reference within libc.so if it actually gets used. None of the
code currently uses them, which is why this probably went unnoticed.
diff --git a/ChangeLog b/ChangeLog
index 19cb14c..ded27a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2013-06-11 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * include/time.h (__clock_gettime): Add libc_hidden_proto.
+ * rt/clock_getcpuclockid.c (clock_getcpuclockid): Rename to
+ __clock_getcpuclockid. Add weak_alias and libc_hidden_def.
+ * sysdeps/unix/sysv/linux/clock_getcpuclockid.c
+ (clock_getcpuclockid): Likewise.
+ * rt/clock_getres.c (clock_getres): Rename to __clock_getres.
+ Add weak_alias and libc_hidden_def.
+ * sysdeps/posix/clock_getres.c (clock_getres): Likewise.
+ * rt/clock_gettime.c (clock_gettime): Rename to
+ __clock_gettime. Add weak_alias and libc_hidden_def.
+ * sysdeps/unix/clock_gettime.c (clock_gettime): Likewise.
+ * rt/clock_nanosleep.c (clock_nanosleep): Rename to
+ __clock_nanosleep. Add weak_alias and libc_hidden_def.
+ * sysdeps/unix/clock_nanosleep.c (clock_nanosleep): Likewise.
+ * sysdeps/unix/sysv/linux/clock_nanosleep.c (clock_nanosleep):
+ Likewise.
+ * rt/clock_settime.c (clock_settime): Rename to
+ __clock_settime. Add weak_alias and libc_hidden_def.
+ * sysdeps/unix/clock_settime.c (clock_settime): Likewise.
+
2013-06-10 Joseph Myers <joseph@codesourcery.com>
* mach/err_boot.sub: Remove trailing whitespace.
diff --git a/include/time.h b/include/time.h
index 9be15b9..8dd10dc 100644
--- a/include/time.h
+++ b/include/time.h
@@ -21,6 +21,7 @@ libc_hidden_proto (strptime)
extern __typeof (clock_getres) __clock_getres;
extern __typeof (clock_gettime) __clock_gettime;
+libc_hidden_proto (__clock_gettime)
extern __typeof (clock_settime) __clock_settime;
extern __typeof (clock_nanosleep) __clock_nanosleep;
extern __typeof (clock_getcpuclockid) __clock_getcpuclockid;
diff --git a/rt/clock_getcpuclockid.c b/rt/clock_getcpuclockid.c
index 44d7724..d16ce14 100644
--- a/rt/clock_getcpuclockid.c
+++ b/rt/clock_getcpuclockid.c
@@ -21,7 +21,7 @@
#include <unistd.h>
int
-clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
+__clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
{
/* We don't allow any process ID but our own. */
if (pid != 0 && pid != getpid ())
@@ -37,4 +37,4 @@ clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
return ENOENT;
#endif
}
-strong_alias (clock_getcpuclockid, __clock_getcpuclockid)
+weak_alias (__clock_getcpuclockid, clock_getcpuclockid)
diff --git a/rt/clock_getres.c b/rt/clock_getres.c
index cd59b14..df19c40 100644
--- a/rt/clock_getres.c
+++ b/rt/clock_getres.c
@@ -21,10 +21,10 @@
/* Get resolution of clock. */
int
-clock_getres (clockid_t clock_id, struct timespec *res)
+__clock_getres (clockid_t clock_id, struct timespec *res)
{
__set_errno (ENOSYS);
return -1;
}
-strong_alias (clock_getres, __clock_getres)
+weak_alias (__clock_getres, clock_getres)
stub_warning (clock_getres)
diff --git a/rt/clock_gettime.c b/rt/clock_gettime.c
index cc7936d..1c9e524 100644
--- a/rt/clock_gettime.c
+++ b/rt/clock_gettime.c
@@ -21,10 +21,11 @@
/* Get current value of CLOCK and store it in TP. */
int
-clock_gettime (clockid_t clock_id, struct timespec *tp)
+__clock_gettime (clockid_t clock_id, struct timespec *tp)
{
__set_errno (ENOSYS);
return -1;
}
-strong_alias (clock_gettime, __clock_gettime)
+weak_alias (__clock_gettime, clock_gettime)
+libc_hidden_def (__clock_gettime)
stub_warning (clock_gettime)
diff --git a/rt/clock_nanosleep.c b/rt/clock_nanosleep.c
index 24f8bc6..8779147 100644
--- a/rt/clock_nanosleep.c
+++ b/rt/clock_nanosleep.c
@@ -20,8 +20,8 @@
#include <time.h>
int
-clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
- struct timespec *rem)
+__clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
+ struct timespec *rem)
{
if (__builtin_expect (req->tv_nsec, 0) < 0
|| __builtin_expect (req->tv_nsec, 0) >= 1000000000)
@@ -33,5 +33,5 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
/* Not implemented. */
return ENOSYS;
}
-strong_alias (clock_nanosleep, __clock_nanosleep)
+weak_alias (__clock_nanosleep, clock_nanosleep)
stub_warning (clock_nanosleep)
diff --git a/rt/clock_settime.c b/rt/clock_settime.c
index 411a7ee..9249f26 100644
--- a/rt/clock_settime.c
+++ b/rt/clock_settime.c
@@ -21,10 +21,10 @@
/* Set CLOCK to value TP. */
int
-clock_settime (clockid_t clock_id, const struct timespec *tp)
+__clock_settime (clockid_t clock_id, const struct timespec *tp)
{
__set_errno (ENOSYS);
return -1;
}
-strong_alias (clock_settime, __clock_settime)
+weak_alias (__clock_settime, clock_settime)
stub_warning (clock_settime)
diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c
index 7581f32..5d898e4 100644
--- a/sysdeps/posix/clock_getres.c
+++ b/sysdeps/posix/clock_getres.c
@@ -76,7 +76,7 @@ realtime_getres (struct timespec *res)
/* Get resolution of clock. */
int
-clock_getres (clockid_t clock_id, struct timespec *res)
+__clock_getres (clockid_t clock_id, struct timespec *res)
{
int retval = -1;
@@ -115,4 +115,4 @@ clock_getres (clockid_t clock_id, struct timespec *res)
return retval;
}
-strong_alias (clock_getres, __clock_getres)
+weak_alias (__clock_getres, clock_getres)
diff --git a/sysdeps/unix/clock_gettime.c b/sysdeps/unix/clock_gettime.c
index 1c64f07..d46057a 100644
--- a/sysdeps/unix/clock_gettime.c
+++ b/sysdeps/unix/clock_gettime.c
@@ -89,7 +89,7 @@ realtime_gettime (struct timespec *tp)
/* Get current value of CLOCK and store it in TP. */
int
-clock_gettime (clockid_t clock_id, struct timespec *tp)
+__clock_gettime (clockid_t clock_id, struct timespec *tp)
{
int retval = -1;
@@ -132,4 +132,5 @@ clock_gettime (clockid_t clock_id, struct timespec *tp)
return retval;
}
-strong_alias (clock_gettime, __clock_gettime)
+weak_alias (__clock_gettime, clock_gettime)
+libc_hidden_def (__clock_gettime)
diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c
index 33fee7b..0079324 100644
--- a/sysdeps/unix/clock_nanosleep.c
+++ b/sysdeps/unix/clock_nanosleep.c
@@ -39,8 +39,8 @@
/* This implementation assumes that these is only a `nanosleep' system
call. So we have to remap all other activities. */
int
-clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
- struct timespec *rem)
+__clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
+ struct timespec *rem)
{
struct timespec now;
@@ -98,4 +98,4 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
return __builtin_expect (nanosleep (req, rem), 0) ? errno : 0;
}
-strong_alias (clock_nanosleep, __clock_nanosleep)
+weak_alias (__clock_nanosleep, clock_nanosleep)
diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c
index 48269cc..6605e9e 100644
--- a/sysdeps/unix/clock_settime.c
+++ b/sysdeps/unix/clock_settime.c
@@ -72,7 +72,7 @@ hp_timing_settime (clockid_t clock_id, const struct timespec *tp)
/* Set CLOCK to value TP. */
int
-clock_settime (clockid_t clock_id, const struct timespec *tp)
+__clock_settime (clockid_t clock_id, const struct timespec *tp)
{
int retval;
@@ -124,4 +124,4 @@ clock_settime (clockid_t clock_id, const struct timespec *tp)
return retval;
}
-strong_alias (clock_settime, __clock_settime)
+weak_alias (__clock_settime, clock_settime)
diff --git a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
index 5c89c66..e234bdc 100644
--- a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
+++ b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c
@@ -23,7 +23,7 @@
#include "kernel-posix-cpu-timers.h"
int
-clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
+__clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
{
/* The clockid_t value is a simple computation from the PID.
But we do a clock_getres call to validate it. */
@@ -46,4 +46,4 @@ clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
else
return INTERNAL_SYSCALL_ERRNO (r, err);
}
-strong_alias (clock_getcpuclockid, __clock_getcpuclockid)
+weak_alias (__clock_getcpuclockid, clock_getcpuclockid)
diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c
index 41bc5e9..2e496d2 100644
--- a/sysdeps/unix/sysv/linux/clock_nanosleep.c
+++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c
@@ -26,8 +26,8 @@
/* We can simply use the syscall. The CPU clocks are not supported
with this function. */
int
-clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
- struct timespec *rem)
+__clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
+ struct timespec *rem)
{
INTERNAL_SYSCALL_DECL (err);
int r;
@@ -52,4 +52,4 @@ clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
return (INTERNAL_SYSCALL_ERROR_P (r, err)
? INTERNAL_SYSCALL_ERRNO (r, err) : 0);
}
-strong_alias (clock_nanosleep, __clock_nanosleep)
+weak_alias (__clock_nanosleep, clock_nanosleep)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 22 ++++++++++++++++++++++
include/time.h | 1 +
rt/clock_getcpuclockid.c | 4 ++--
rt/clock_getres.c | 4 ++--
rt/clock_gettime.c | 5 +++--
rt/clock_nanosleep.c | 6 +++---
rt/clock_settime.c | 4 ++--
sysdeps/posix/clock_getres.c | 4 ++--
sysdeps/unix/clock_gettime.c | 5 +++--
sysdeps/unix/clock_nanosleep.c | 6 +++---
sysdeps/unix/clock_settime.c | 4 ++--
sysdeps/unix/sysv/linux/clock_getcpuclockid.c | 4 ++--
sysdeps/unix/sysv/linux/clock_nanosleep.c | 6 +++---
13 files changed, 50 insertions(+), 25 deletions(-)
hooks/post-receive
--
GNU C Library master sources