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-562-g9f45bfe
- From: cmetcalf at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Oct 2012 18:21:23 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-562-g9f45bfe
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 9f45bfe790a59bfc072ef096b21dc701e03bccf9 (commit)
via 47cc1490e0a610bd74a31c6699a3859a823da9b3 (commit)
via 017678433caae358b1782a2438b10e1ed510a8ad (commit)
from d44a6f8b9995932b20a2ebbf4ca2fb1be673e49d (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=9f45bfe790a59bfc072ef096b21dc701e03bccf9
commit 9f45bfe790a59bfc072ef096b21dc701e03bccf9
Author: Chris Metcalf <cmetcalf@tilera.com>
Date: Tue Oct 30 14:17:49 2012 -0400
check-local-headers: Ignore <arch> headers
The tile architecture's Linux port installs headers in an
<arch> directory; these headers are in part shared with glibc.
Ignore these headers for check-local-headers like we ignore
all the other Linux headers.
diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
index 7fafcbf..e914c4b 100755
--- a/scripts/check-local-headers.sh
+++ b/scripts/check-local-headers.sh
@@ -27,11 +27,12 @@ shopt -s nullglob
# Search all dependency files for file names in the include directory.
# There are a few system headers we are known to use.
+# These include Linux kernel headers (asm*, arch, and linux).
exec ${AWK} -v includedir="$includedir" '
BEGIN {
status = 0
exclude = "^" includedir \
- "/(.*-.*-.*/|)(asm[-/]|linux/|selinux/|gd|nss3/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
+ "/(.*-.*-.*/|)(asm[-/]|arch|linux/|selinux/|gd|nss3/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
}
/^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
{
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=47cc1490e0a610bd74a31c6699a3859a823da9b3
commit 47cc1490e0a610bd74a31c6699a3859a823da9b3
Author: Chris Metcalf <cmetcalf@tilera.com>
Date: Tue Oct 30 14:16:18 2012 -0400
Invoke DL_AFTER_LOAD if defined
This hook is useful for any arch-specific functionality that
should be done on loaded objects. For the tile architecture,
the hook is already provided (though we switch to using the new
macro name with this commit) and implements a simulator notifier
so that the simulator can load Elf symbols to match the object
and generate better error messages for PC's.
Also, remove a spurious definition of DL_UNMAP in dl-runtime.c
diff --git a/ChangeLog b/ChangeLog
index e65ea23..e9a2794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-10-30 Chris Metcalf <cmetcalf@tilera.com>
+ * elf/dl-load.c (_dl_map_object_from_fd): Call DL_AFTER_LOAD
+ if defined.
+
* nss/nsswitch.h (nss_interface_function): Provide new
macro for use with NSS functions.
* grp/initgroups.c: Use new macro.
diff --git a/elf/dl-load.c b/elf/dl-load.c
index 4b57879..a695556 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1580,6 +1580,10 @@ cannot enable executable stack as shared object requires");
add_name_to_object (l, ((const char *) D_PTR (l, l_info[DT_STRTAB])
+ l->l_info[DT_SONAME]->d_un.d_val));
+#ifdef DL_AFTER_LOAD
+ DL_AFTER_LOAD (l);
+#endif
+
/* Now that the object is fully initialized add it to the object list. */
_dl_add_to_namespace_list (l, nsid);
diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
index 63ca021..1f04349 100644
--- a/ports/ChangeLog.tile
+++ b/ports/ChangeLog.tile
@@ -1,5 +1,10 @@
2012-10-30 Chris Metcalf <cmetcalf@tilera.com>
+ * sysdeps/tile/dl-machine.h: Use new DL_AFTER_LOAD macro
+ and rename _dl_arch_map_object to _dl_after_load.
+ * sysdeps/tile/dl-runtime.c: Rename _dl_arch_map_object
+ to _dl_after_load and remove spurious DL_UNMAP definition.
+
* sysdeps/unix/sysv/linux/tile/init-first.c: Use better #include.
* sysdeps/unix/sysv/linux/tile/gettimeofday.c: Use gettimeofday
aliases that match existing tile ABI.
diff --git a/ports/sysdeps/tile/dl-machine.h b/ports/sysdeps/tile/dl-machine.h
index c4413f9..09a2993 100644
--- a/ports/sysdeps/tile/dl-machine.h
+++ b/ports/sysdeps/tile/dl-machine.h
@@ -253,8 +253,8 @@ elf_machine_plt_value (struct link_map *map, const ElfW(Rela) *reloc,
}
/* Support notifying the simulator about new objects. */
-void internal_function _dl_arch_map_object (struct link_map *l);
-#define _dl_arch_map_object _dl_arch_map_object
+void internal_function _dl_after_load (struct link_map *l);
+#define DL_AFTER_LOAD _dl_after_load
/* Names of the architecture-specific auditing callback functions. */
#define ARCH_LA_PLTENTER tile_gnu_pltenter
diff --git a/ports/sysdeps/tile/dl-runtime.c b/ports/sysdeps/tile/dl-runtime.c
index 0aa211d..6864c3a 100644
--- a/ports/sysdeps/tile/dl-runtime.c
+++ b/ports/sysdeps/tile/dl-runtime.c
@@ -30,7 +30,7 @@
/* Support notifying the simulator about new objects. */
void internal_function
-_dl_arch_map_object (struct link_map *l)
+_dl_after_load (struct link_map *l)
{
int shift;
@@ -75,5 +75,3 @@ _dl_unmap (struct link_map *l)
__munmap ((void *) l->l_map_start, l->l_map_end - l->l_map_start);
}
-
-#define DL_UNMAP(map) _dl_unmap (map)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=017678433caae358b1782a2438b10e1ed510a8ad
commit 017678433caae358b1782a2438b10e1ed510a8ad
Author: Chris Metcalf <cmetcalf@tilera.com>
Date: Tue Oct 30 14:14:33 2012 -0400
Suppress incorrect link warnings for NSS symbols
When glibc is built with --enable-static-nss, the warning that
using NSS symbols requires the nss shared objects to be present
is no longer true, as those symbols are built into libc. Suppress
the warning for those symbols by providing a new macro
(nss_interface_function) for the NSS functions that is defined as
static_link_warning in the normal case, and empty for static NSS.
diff --git a/ChangeLog b/ChangeLog
index 021b0cd..e65ea23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2012-10-30 Chris Metcalf <cmetcalf@tilera.com>
+
+ * nss/nsswitch.h (nss_interface_function): Provide new
+ macro for use with NSS functions.
+ * grp/initgroups.c: Use new macro.
+ * nss/getXXbyYY.c: Likewise.
+ * nss/getXXbyYY_r.c: Likewise.
+ * nss/getXXent.c: Likewise.
+ * nss/getXXent_r.c: Likewise.
+ * sysdeps/posix/getaddrinfo.c: Likewise.
+
2012-10-30 Andreas Jaeger <aj@suse.de>
* po/ru.po: Update Russion translation from translation project.
diff --git a/grp/initgroups.c b/grp/initgroups.c
index 62fd1fc..fad30a7 100644
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -180,7 +180,7 @@ getgrouplist (const char *user, gid_t group, gid_t *groups, int *ngroups)
return retval;
}
-static_link_warning (getgrouplist)
+nss_interface_function (getgrouplist)
/* Initialize the group set for the current user
by reading the group database and using all groups
@@ -230,4 +230,4 @@ initgroups (const char *user, gid_t group)
#endif
}
-static_link_warning (initgroups)
+nss_interface_function (initgroups)
diff --git a/nss/getXXbyYY.c b/nss/getXXbyYY.c
index 336676a..c308a70 100644
--- a/nss/getXXbyYY.c
+++ b/nss/getXXbyYY.c
@@ -151,4 +151,4 @@ done:
return result;
}
-static_link_warning (FUNCTION_NAME)
+nss_interface_function (FUNCTION_NAME)
diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
index f296ed1..8b3b61b 100644
--- a/nss/getXXbyYY_r.c
+++ b/nss/getXXbyYY_r.c
@@ -349,4 +349,4 @@ do_default_symbol_version (NEW (REENTRANT_NAME),
REENTRANT_NAME, GLIBC_2_1_2);
#endif
-static_link_warning (REENTRANT_NAME)
+nss_interface_function (REENTRANT_NAME)
diff --git a/nss/getXXent.c b/nss/getXXent.c
index 008851e..152798f 100644
--- a/nss/getXXent.c
+++ b/nss/getXXent.c
@@ -91,4 +91,4 @@ GETFUNC_NAME (void)
return result;
}
-static_link_warning (GETFUNC_NAME)
+nss_interface_function (GETFUNC_NAME)
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index f103605..6c52d27 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -207,6 +207,6 @@ do_default_symbol_version (NEW (REENTRANT_GETNAME),
REENTRANT_GETNAME, GLIBC_2_1_2);
#endif
-static_link_warning (SETFUNC_NAME)
-static_link_warning (ENDFUNC_NAME)
-static_link_warning (REENTRANT_GETNAME)
+nss_interface_function (SETFUNC_NAME)
+nss_interface_function (ENDFUNC_NAME)
+nss_interface_function (REENTRANT_GETNAME)
diff --git a/nss/nsswitch.h b/nss/nsswitch.h
index 047a9e5..0cf67ff 100644
--- a/nss/nsswitch.h
+++ b/nss/nsswitch.h
@@ -107,6 +107,14 @@ enum
/* Flags whether custom rules for database is set. */
extern bool __nss_database_custom[NSS_DBSIDX_max];
+/* Warning for NSS functions, which don't require dlopen if glibc
+ was built with --enable-static-nss. */
+#ifdef DO_STATIC_NSS
+# define nss_interface_function(name)
+#else
+# define nss_interface_function(name) static_link_warning (name)
+#endif
+
/* Interface functions for NSS. */
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 672571e..3cc244b 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -2672,7 +2672,7 @@ getaddrinfo (const char *name, const char *service,
}
libc_hidden_def (getaddrinfo)
-static_link_warning (getaddrinfo)
+nss_interface_function (getaddrinfo)
void
freeaddrinfo (struct addrinfo *ai)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 14 ++++++++++++++
elf/dl-load.c | 4 ++++
grp/initgroups.c | 4 ++--
nss/getXXbyYY.c | 2 +-
nss/getXXbyYY_r.c | 2 +-
nss/getXXent.c | 2 +-
nss/getXXent_r.c | 6 +++---
nss/nsswitch.h | 8 ++++++++
ports/ChangeLog.tile | 5 +++++
ports/sysdeps/tile/dl-machine.h | 4 ++--
ports/sysdeps/tile/dl-runtime.c | 4 +---
scripts/check-local-headers.sh | 3 ++-
sysdeps/posix/getaddrinfo.c | 2 +-
13 files changed, 45 insertions(+), 15 deletions(-)
hooks/post-receive
--
GNU C Library master sources