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-588-g7402596
- From: tschwinge at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 1 Nov 2012 20:25:35 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-588-g7402596
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 7402596be74d948048ff6bc11c9978b51e2de69e (commit)
via d0d4f8689dcc4a975c9065534c54447e09433e85 (commit)
from 6f796e1b5252490e23d42a0aa3a5c35e28f1f5af (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=7402596be74d948048ff6bc11c9978b51e2de69e
commit 7402596be74d948048ff6bc11c9978b51e2de69e
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Thu Nov 1 18:54:57 2012 +0100
Fix build of test cases on GNU Hurd that are statically linked.
diff --git a/ChangeLog b/ChangeLog
index 242c51a..c184e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-11-01 Thomas Schwinge <thomas@codesourcery.com>
+ * sysdeps/mach/hurd/Makefile (link-libc-static-tests): New
+ variable.
+
* elf/dl-support.c: Unconditionally include "setup-vdso.h".
* sysdeps/mach/hurd/powerpc: Remove directory.
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index 107eaaf..ed77903 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -167,11 +167,15 @@ $(objpfx)librtld.map: $(rpcuserlibs:.so=_pic.a)
CFLAGS-dl-load.c = -DEXTERNAL_MAP_FROM_FD
endif
-# We need these libs to link static programs in the libc source tree, too.
-link-libc-static := -Wl,-\( \
+# Override the generic Makeconfig values so we link against the RPC libs.
+link-libc-static := -Wl,--start-group \
$(patsubst %,$(common-objpfx)%.a,\
libc mach/libmachuser hurd/libhurduser) \
- $(static-gnulib) -Wl,-\)
+ $(static-gnulib) -Wl,--end-group
+link-libc-static-tests := -Wl,--start-group \
+ $(patsubst %,$(common-objpfx)%.a,\
+ libc mach/libmachuser hurd/libhurduser) \
+ $(static-gnulib-tests) -Wl,--end-group
ifeq ($(subdir),csu)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d0d4f8689dcc4a975c9065534c54447e09433e85
commit d0d4f8689dcc4a975c9065534c54447e09433e85
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Thu Nov 1 18:48:34 2012 +0100
Fix build for !(defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO).
diff --git a/ChangeLog b/ChangeLog
index 25d82dd..242c51a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2012-11-01 Thomas Schwinge <thomas@codesourcery.com>
+ * elf/dl-support.c: Unconditionally include "setup-vdso.h".
+
* sysdeps/mach/hurd/powerpc: Remove directory.
* sysdeps/mach/powerpc: Likewise.
diff --git a/elf/dl-support.c b/elf/dl-support.c
index fd72c1b..81e7172 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -165,8 +165,8 @@ const ElfW(Ehdr) *_dl_sysinfo_dso;
struct link_map *_dl_sysinfo_map;
# include "get-dynamic-info.h"
-# include "setup-vdso.h"
#endif
+#include "setup-vdso.h"
/* During the program run we must not modify the global data of
loaded shared object simultanously in two threads. Therefore we
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
elf/dl-support.c | 2 +-
sysdeps/mach/hurd/Makefile | 10 +++++++---
3 files changed, 13 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources