This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/global updated. glibc-2.16-ports-merge-744-gce196a9
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 21 Nov 2012 15:45:06 -0000
- Subject: GNU C Library master sources branch hjl/global updated. glibc-2.16-ports-merge-744-gce196a9
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, hjl/global has been updated
via ce196a982fa5de72534ca59904811cd0c5f7cda0 (commit)
from 6b96893cfb3aba8a614d8875926b6f7d4974a41f (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=ce196a982fa5de72534ca59904811cd0c5f7cda0
commit ce196a982fa5de72534ca59904811cd0c5f7cda0
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Nov 21 07:44:16 2012 -0800
Mark reldepmod7.so with DF_1_GLOBAL
diff --git a/elf/Makefile b/elf/Makefile
index aa744e4..a70b836 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -214,7 +214,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
tst-initorder2a tst-initorder2b tst-initorder2c \
tst-initorder2d \
tst-relsort1mod1 tst-relsort1mod2 tst-array2dep \
- tst-array5dep
+ tst-array5dep reldepmod7
ifeq (yesyes,$(have-fpie)$(build-shared))
modules-names += tst-piemod1
tests += tst-pie1
@@ -745,9 +745,9 @@ $(objpfx)nodelete2.out: $(objpfx)nodel2mod3.so
$(objpfx)reldep9: $(libdl)
$(objpfx)reldep9.out: $(objpfx)reldep9mod3.so
-LDFLAGS-reldep10 = -Wl,-z,global
+LDFLAGS-reldepmod7.so = -Wl,-z,global
$(objpfx)reldep10: $(libdl)
-$(objpfx)reldep10.out: $(objpfx)reldepmod1.so $(objpfx)reldepmod3.so
+$(objpfx)reldep10.out: $(objpfx)reldepmod7.so $(objpfx)reldepmod3.so
$(objpfx)tst-tls3: $(objpfx)tst-tlsmod1.so
diff --git a/elf/reldep10.c b/elf/reldep10.c
index 45ebcf9..c6dba73 100644
--- a/elf/reldep10.c
+++ b/elf/reldep10.c
@@ -13,11 +13,11 @@ main (void)
mtrace ();
- /* Open the two objects. */
- h1 = dlopen ("reldepmod1.so", RTLD_LAZY);
+ /* Open the two objects. reldepmod7.so is marked with DF_1_GLOBAL. */
+ h1 = dlopen ("reldepmod7.so", RTLD_LAZY);
if (h1 == NULL)
{
- printf ("cannot open reldepmod1.so: %s\n", dlerror ());
+ printf ("cannot open reldepmod7.so: %s\n", dlerror ());
exit (1);
}
h2 = dlopen ("reldepmod3.so", RTLD_LAZY);
@@ -62,10 +62,10 @@ main (void)
}
/* Open the first object again. */
- h1 = dlopen ("reldepmod1.so", RTLD_LAZY | RTLD_GLOBAL);
+ h1 = dlopen ("reldepmod7.so", RTLD_LAZY);
if (h1 == NULL)
{
- printf ("cannot open reldepmod1.so the second time: %s\n", dlerror ());
+ printf ("cannot open reldepmod7.so the second time: %s\n", dlerror ());
exit (1);
}
diff --git a/elf/reldepmod7.c b/elf/reldepmod7.c
new file mode 100644
index 0000000..b8ef640
--- /dev/null
+++ b/elf/reldepmod7.c
@@ -0,0 +1,10 @@
+extern int foo (void);
+
+int some_var;
+
+
+int
+foo (void)
+{
+ return some_var;
+}
-----------------------------------------------------------------------
Summary of changes:
elf/Makefile | 6 +++---
elf/reldep10.c | 10 +++++-----
elf/{reldepmod1.c => reldepmod7.c} | 0
3 files changed, 8 insertions(+), 8 deletions(-)
copy elf/{reldepmod1.c => reldepmod7.c} (100%)
hooks/post-receive
--
GNU C Library master sources