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.22-398-g6d56699
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Oct 2015 21:20:08 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-398-g6d56699
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 6d56699d7e808419ccf244150ecba122156932ba (commit)
via 8303c7409cee86f42485177061d1e0ce04c07e9f (commit)
via d6e855d810730193280276a2d30584437e2abf4d (commit)
from a1afb41193e908668eeac7e3a25a48ac535aff67 (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=6d56699d7e808419ccf244150ecba122156932ba
commit 6d56699d7e808419ccf244150ecba122156932ba
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Oct 15 14:16:22 2015 -0700
Mark internal fcntl functions hidden
Since internal fcntl functions are only used internally in ld.so and
libc.so, they can be made hidden.
[BZ #19122]
* include/fcntl.h (__libc_fcntl): Add attribute_hidden.
[IS_IN (rtld)] (__open): Likewise.
[IS_IN (rtld)] (__fcntl): Likewise.
diff --git a/ChangeLog b/ChangeLog
index d0dbccf..338608b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2015-10-15 H.J. Lu <hongjiu.lu@intel.com>
[BZ #19122]
+ * include/fcntl.h (__libc_fcntl): Add attribute_hidden.
+ [IS_IN (rtld)] (__open): Likewise.
+ [IS_IN (rtld)] (__fcntl): Likewise.
+
* include/dirent.h (__opendirat): Add attribute_hidden.
(__getdents): Likewise.
(__getdents64): Likewise.
diff --git a/include/fcntl.h b/include/fcntl.h
index de23728..4168ee4 100644
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -8,7 +8,7 @@ libc_hidden_proto (__open64)
extern int __libc_open64 (const char *file, int oflag, ...);
extern int __libc_open (const char *file, int oflag, ...);
libc_hidden_proto (__libc_open)
-extern int __libc_fcntl (int fd, int cmd, ...);
+extern int __libc_fcntl (int fd, int cmd, ...) attribute_hidden;
#ifndef NO_CANCELLATION
extern int __fcntl_nocancel (int fd, int cmd, ...) attribute_hidden;
libc_hidden_proto (__libc_fcntl)
@@ -30,6 +30,11 @@ extern int __openat_2 (int __fd, const char *__path, int __oflag);
extern int __openat64_2 (int __fd, const char *__path, int __oflag);
+#if IS_IN (rtld)
+extern __typeof (__open) __open attribute_hidden;
+extern __typeof (__fcntl) __fcntl attribute_hidden;
+#endif
+
/* Flag determining whether the *at system calls are available. */
extern int __have_atfcts attribute_hidden;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8303c7409cee86f42485177061d1e0ce04c07e9f
commit 8303c7409cee86f42485177061d1e0ce04c07e9f
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Oct 15 14:15:26 2015 -0700
Mark internal dirent functions hidden
Since internal dirent functions are only used internally in ld.so and
libc.so, they can be made hidden.
[BZ #19122]
* include/dirent.h (__opendirat): Add attribute_hidden.
(__getdents): Likewise.
(__getdents64): Likewise.
(__alloc_dir): Likewise.
[IS_IN (rtld)] (__closedir): Likewise.
[IS_IN (rtld)] (__fdopendir): Likewise.
[IS_IN (rtld)] (__readdir): Likewise.
[IS_IN (rtld)] (__readdir64): Likewise.
[IS_IN (rtld)] (__rewinddir): Likewise.
diff --git a/ChangeLog b/ChangeLog
index 110d670..d0dbccf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
2015-10-15 H.J. Lu <hongjiu.lu@intel.com>
[BZ #19122]
+ * include/dirent.h (__opendirat): Add attribute_hidden.
+ (__getdents): Likewise.
+ (__getdents64): Likewise.
+ (__alloc_dir): Likewise.
+ [IS_IN (rtld)] (__closedir): Likewise.
+ [IS_IN (rtld)] (__fdopendir): Likewise.
+ [IS_IN (rtld)] (__readdir): Likewise.
+ [IS_IN (rtld)] (__readdir64): Likewise.
+ [IS_IN (rtld)] (__rewinddir): Likewise.
+
* include/dlfcn.h (_dl_catch_error): Moved to ...
* sysdeps/generic/ldsodefs.h (_dl_catch_error): Add
attribute_hidden.
diff --git a/include/dirent.h b/include/dirent.h
index 258f2d0..c792e53 100644
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -16,7 +16,8 @@ struct scandir_cancel_struct
/* Now define the internal interfaces. */
extern DIR *__opendir (const char *__name);
-extern DIR *__opendirat (int dfd, const char *__name) internal_function;
+extern DIR *__opendirat (int dfd, const char *__name)
+ internal_function attribute_hidden;
extern DIR *__fdopendir (int __fd);
extern int __closedir (DIR *__dirp);
extern struct dirent *__readdir (DIR *__dirp);
@@ -35,9 +36,9 @@ extern __ssize_t __getdirentries (int __fd, char *__restrict __buf,
__off_t *__restrict __basep)
__THROW __nonnull ((2, 4));
extern __ssize_t __getdents (int __fd, char *__buf, size_t __nbytes)
- internal_function;
+ internal_function attribute_hidden;
extern __ssize_t __getdents64 (int __fd, char *__buf, size_t __nbytes)
- internal_function;
+ internal_function attribute_hidden;
extern int __alphasort64 (const struct dirent64 **a, const struct dirent64 **b)
__attribute_pure__;
extern int __versionsort64 (const struct dirent64 **a,
@@ -45,7 +46,7 @@ extern int __versionsort64 (const struct dirent64 **a,
__attribute_pure__;
extern DIR *__alloc_dir (int fd, bool close_fd, int flags,
const struct stat64 *statp)
- internal_function;
+ internal_function attribute_hidden;
extern __typeof (rewinddir) __rewinddir;
extern void __scandir_cancel_handler (void *arg) attribute_hidden;
@@ -74,6 +75,14 @@ libc_hidden_proto (__rewinddir)
extern __typeof (scandirat) __scandirat;
libc_hidden_proto (__scandirat)
libc_hidden_proto (scandirat64)
+
+# if IS_IN (rtld)
+extern __typeof (__closedir) __closedir attribute_hidden;
+extern __typeof (__fdopendir) __fdopendir attribute_hidden;
+extern __typeof (__readdir) __readdir attribute_hidden;
+extern __typeof (__readdir64) __readdir64 attribute_hidden;
+extern __typeof (__rewinddir) __rewinddir attribute_hidden;
+# endif
# endif
#endif
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d6e855d810730193280276a2d30584437e2abf4d
commit d6e855d810730193280276a2d30584437e2abf4d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Oct 15 14:13:37 2015 -0700
Mark _dl_catch_error hidden
Since _dl_catch_error is only used internally in ld.so, it should be
declared in sysdeps/generic/ldsodefs.h, not include/dlfcn.h and it can
be made hidden.
[BZ #19122]
* include/dlfcn.h (_dl_catch_error): Moved to ...
* sysdeps/generic/ldsodefs.h (_dl_catch_error): Add
attribute_hidden.
diff --git a/ChangeLog b/ChangeLog
index b93c0a8..110d670 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2015-10-15 H.J. Lu <hongjiu.lu@intel.com>
[BZ #19122]
+ * include/dlfcn.h (_dl_catch_error): Moved to ...
+ * sysdeps/generic/ldsodefs.h (_dl_catch_error): Add
+ attribute_hidden.
+
* sysdeps/generic/_itoa.h (_itoa): Add attribute_hidden.
(_itoa_word): Likewise.
diff --git a/include/dlfcn.h b/include/dlfcn.h
index 0ce0af5..2524292 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -71,19 +71,6 @@ extern void *_dl_vsym (void *handle, const char *name, const char *version,
void *who)
internal_function;
-/* Call OPERATE, catching errors from `dl_signal_error'. If there is no
- error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is
- set to a string constructed from the strings passed to _dl_signal_error,
- and the error code passed is the return value and *OBJNAME is set to
- the object name which experienced the problems. ERRSTRING if nonzero
- points to a malloc'ed string which the caller has to free after use.
- ARGS is passed as argument to OPERATE. MALLOCEDP is set to true only
- if the returned string is allocated using the libc's malloc. */
-extern int _dl_catch_error (const char **objname, const char **errstring,
- bool *mallocedp, void (*operate) (void *),
- void *args)
- internal_function;
-
/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via
_dl_catch_error. Returns zero for success, nonzero for failure; and
arranges for `dlerror' to return the error details.
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index bb1b3ed..a8caf47 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -738,6 +738,18 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *),
void *args)
internal_function attribute_hidden;
+/* Call OPERATE, catching errors from `dl_signal_error'. If there is no
+ error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is
+ set to a string constructed from the strings passed to _dl_signal_error,
+ and the error code passed is the return value and *OBJNAME is set to
+ the object name which experienced the problems. ERRSTRING if nonzero
+ points to a malloc'ed string which the caller has to free after use.
+ ARGS is passed as argument to OPERATE. MALLOCEDP is set to true only
+ if the returned string is allocated using the libc's malloc. */
+extern int _dl_catch_error (const char **objname, const char **errstring,
+ bool *mallocedp, void (*operate) (void *),
+ void *args)
+ internal_function attribute_hidden;
/* Open the shared object NAME and map in its segments.
LOADER's DT_RPATH is used in searching for NAME.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 18 ++++++++++++++++++
include/dirent.h | 17 +++++++++++++----
include/dlfcn.h | 13 -------------
include/fcntl.h | 7 ++++++-
sysdeps/generic/ldsodefs.h | 12 ++++++++++++
5 files changed, 49 insertions(+), 18 deletions(-)
hooks/post-receive
--
GNU C Library master sources