From a9564ae94bc6c852ce47629d1ba735aadb8737b4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 13 Jul 2005 06:26:17 +0000 Subject: [PATCH] * include/libc-symbols.h: Define macros for librt hidden symbols. * include/time.h: Add librt_hidden_proto definition for clock_gettime. * sysdeps/generic/clock_gettime.c: Add librt_hidden_def. * sysdeps/unix/clock_gettime.c: Likewise. --- ChangeLog | 5 +++++ include/libc-symbols.h | 18 ++++++++++++++++++ include/time.h | 2 ++ sysdeps/generic/clock_gettime.c | 3 ++- sysdeps/unix/clock_gettime.c | 1 + 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 451234330a..2bfdca84f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-07-12 Ulrich Drepper + * include/libc-symbols.h: Define macros for librt hidden symbols. + * include/time.h: Add librt_hidden_proto definition for clock_gettime. + * sysdeps/generic/clock_gettime.c: Add librt_hidden_def. + * sysdeps/unix/clock_gettime.c: Likewise. + * stdlib/bits/stdlib.h: New file. * stdlib/stdlib.h: Include if fortification is requested. diff --git a/include/libc-symbols.h b/include/libc-symbols.h index cdbc4ef202..4fef305814 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -708,6 +708,24 @@ for linking") # define libresolv_hidden_data_ver(local, name) #endif +#if defined NOT_IN_libc && defined IS_IN_librt +# define librt_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) +# define librt_hidden_def(name) hidden_def (name) +# define librt_hidden_weak(name) hidden_weak (name) +# define librt_hidden_ver(local, name) hidden_ver (local, name) +# define librt_hidden_data_def(name) hidden_data_def (name) +# define librt_hidden_data_weak(name) hidden_data_weak (name) +# define librt_hidden_data_ver(local, name) hidden_data_ver (local, name) +#else +# define librt_hidden_proto(name, attrs...) +# define librt_hidden_def(name) +# define librt_hidden_weak(name) +# define librt_hidden_ver(local, name) +# define librt_hidden_data_def(name) +# define librt_hidden_data_weak(name) +# define librt_hidden_data_ver(local, name) +#endif + #if defined NOT_IN_libc && defined IS_IN_libdl # define libdl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libdl_hidden_def(name) hidden_def (name) diff --git a/include/time.h b/include/time.h index 795eb5f504..3d8fef8bf9 100644 --- a/include/time.h +++ b/include/time.h @@ -17,6 +17,8 @@ libc_hidden_proto (localtime) libc_hidden_proto (strftime) libc_hidden_proto (strptime) +librt_hidden_proto (clock_gettime) + /* Now define the internal interfaces. */ struct tm; diff --git a/sysdeps/generic/clock_gettime.c b/sysdeps/generic/clock_gettime.c index 85bb79c548..ff306120ba 100644 --- a/sysdeps/generic/clock_gettime.c +++ b/sysdeps/generic/clock_gettime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2005 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 @@ -26,5 +26,6 @@ clock_gettime (clockid_t clock_id, struct timespec *tp) __set_errno (ENOSYS); return -1; } +librt_hidden_def (clock_gettime) stub_warning (clock_gettime) #include diff --git a/sysdeps/unix/clock_gettime.c b/sysdeps/unix/clock_gettime.c index 8f82ac848d..f698f0151b 100644 --- a/sysdeps/unix/clock_gettime.c +++ b/sysdeps/unix/clock_gettime.c @@ -131,3 +131,4 @@ clock_gettime (clockid_t clock_id, struct timespec *tp) return retval; } +librt_hidden_def (clock_gettime)