Annotation of /trunk/glibc/patches/glibc-2.15-testsuite.patch
Parent Directory | Revision Log
Revision 1806 -
(hide annotations)
(download)
Tue Jun 12 12:33:27 2012 UTC (12 years, 3 months ago) by niro
File size: 4371 byte(s)
Tue Jun 12 12:33:27 2012 UTC (12 years, 3 months ago) by niro
File size: 4371 byte(s)
-added patches for 2.15-r1
1 | niro | 1806 | From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001 |
2 | From: Allan McRae <allan@archlinux.org> | ||
3 | Date: Mon, 16 Apr 2012 14:06:47 +1000 | ||
4 | Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed | ||
5 | |||
6 | Signed-off-by: Allan McRae <allan@archlinux.org> | ||
7 | --- | ||
8 | ChangeLog | 24 ++++++++++++++++++++++++ | ||
9 | elf/Makefile | 21 ++++++++++++++++++++- | ||
10 | nptl/ChangeLog | 5 +++++ | ||
11 | nptl/Makefile | 3 ++- | ||
12 | stdlib/Makefile | 1 + | ||
13 | 5 files changed, 52 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/elf/Makefile b/elf/Makefile | ||
16 | index 57dcab0..47729c3 100644 | ||
17 | --- a/elf/Makefile | ||
18 | +++ b/elf/Makefile | ||
19 | @@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb | ||
20 | $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so | ||
21 | $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so | ||
22 | |||
23 | +LDFLAGS-nodel2mod3.so = $(no-as-needed) | ||
24 | +LDFLAGS-reldepmod5.so = $(no-as-needed) | ||
25 | +LDFLAGS-reldep6mod1.so = $(no-as-needed) | ||
26 | +LDFLAGS-reldep6mod4.so = $(no-as-needed) | ||
27 | +LDFLAGS-reldep8mod3.so = $(no-as-needed) | ||
28 | +LDFLAGS-unload4mod1.so = $(no-as-needed) | ||
29 | +LDFLAGS-unload4mod2.so = $(no-as-needed) | ||
30 | +LDFLAGS-tst-initorder = $(no-as-needed) | ||
31 | +LDFLAGS-tst-initordera2.so = $(no-as-needed) | ||
32 | +LDFLAGS-tst-initordera3.so = $(no-as-needed) | ||
33 | +LDFLAGS-tst-initordera4.so = $(no-as-needed) | ||
34 | +LDFLAGS-tst-initorderb2.so = $(no-as-needed) | ||
35 | LDFLAGS-tst-tlsmod5.so = -nostdlib | ||
36 | LDFLAGS-tst-tlsmod6.so = -nostdlib | ||
37 | |||
38 | @@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so) | ||
39 | vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so) | ||
40 | |||
41 | $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so | ||
42 | -LDFLAGS-noload = -rdynamic | ||
43 | +LDFLAGS-noload = -rdynamic $(no-as-needed) | ||
44 | $(objpfx)noload.out: $(objpfx)testobj5.so | ||
45 | |||
46 | $(objpfx)noload-mem: $(objpfx)noload.out | ||
47 | @@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl) | ||
48 | $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so | ||
49 | |||
50 | $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl) | ||
51 | +LDFLAGS-next = $(no-as-needed) | ||
52 | |||
53 | $(objpfx)unload2: $(libdl) | ||
54 | $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so | ||
55 | @@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so | ||
56 | $(objpfx)order2mod4.so: $(objpfx)order2mod3.so | ||
57 | $(objpfx)order2mod2.so: $(objpfx)order2mod3.so | ||
58 | order2mod2.so-no-z-defs = yes | ||
59 | +LDFLAGS-order2mod1.so = $(no-as-needed) | ||
60 | +LDFLAGS-order2mod2.so = $(no-as-needed) | ||
61 | |||
62 | tst-stackguard1-ARGS = --command "$(built-program-cmd) --child" | ||
63 | tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" | ||
64 | @@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so | ||
65 | $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so | ||
66 | $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so | ||
67 | $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so | ||
68 | +LDFLAGS-tst-initorder2 = $(no-as-needed) | ||
69 | +LDFLAGS-tst-initorder2a.so = $(no-as-needed) | ||
70 | +LDFLAGS-tst-initorder2b.so = $(no-as-needed) | ||
71 | +LDFLAGS-tst-initorder2c.so = $(no-as-needed) | ||
72 | define o-iterator-doit | ||
73 | $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \ | ||
74 | $$(compile-command.c) -DNAME=\"$o\" | ||
75 | diff --git a/nptl/Makefile b/nptl/Makefile | ||
76 | index 09acd8a..07a1022 100644 | ||
77 | --- a/nptl/Makefile | ||
78 | +++ b/nptl/Makefile | ||
79 | @@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library) | ||
80 | $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so | ||
81 | |||
82 | $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library) | ||
83 | +LDFLAGS-tst-tls5 = $(no-as-needed) | ||
84 | LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so | ||
85 | |||
86 | ifeq ($(build-shared),yes) | ||
87 | @@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a | ||
88 | $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a | ||
89 | endif | ||
90 | |||
91 | -LDFLAGS-tst-cancel24 = -lstdc++ | ||
92 | +LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++ | ||
93 | |||
94 | extra-B-pthread.so = -B$(common-objpfx)nptl/ | ||
95 | $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs)) | ||
96 | diff --git a/stdlib/Makefile b/stdlib/Makefile | ||
97 | index 44eb20d..f7811c5 100644 | ||
98 | --- a/stdlib/Makefile | ||
99 | +++ b/stdlib/Makefile | ||
100 | @@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg | ||
101 | $(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/ | ||
102 | |||
103 | $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so | ||
104 | +LDFLAGS-tst-putenv = $(no-as-needed) | ||
105 | |||
106 | $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os | ||
107 | $(build-module) | ||
108 | -- | ||
109 | 1.7.3.4 |