Attachment #349608 for bug #470884

View | Details | Raw Unified | Return to bug 470884 | Differences between

and this patch

Lines 111-117 Link Here

(-)elfutils-0.155.orig/libdw/Makefile.am (-1 / +1 lines)
111	-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \	111	-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
112	-Wl,--version-script,$<,--no-undefined \	112	-Wl,--version-script,$<,--no-undefined \
113	-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\	113	-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
114	-ldl $(zip_LIBS)	114	-ldl $(zip_LIBS) -largp
115	if readelf -d $@ \| fgrep -q TEXTREL; then exit 1; fi	115	if readelf -d $@ \| fgrep -q TEXTREL; then exit 1; fi
116	ln -fs $@ $@.$(VERSION)	116	ln -fs $@ $@.$(VERSION)
117		117




# XXX While the file is not finished, don't warn about this
ldgeneric_no_Wunused = yes

readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp \
	   $(demanglelib)
size_LDADD = $(libelf) $(libeu) $(libmudflap) -largp
strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
if NATIVE_LD
# -ldl is always needed for libebl.
ld_LDADD += libld_elf.a
endif
ld_LDFLAGS = -rdynamic
elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) -largp
addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) -largp
elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl -largp
objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp
strings_LDADD = $(libelf) $(libeu) $(libmudflap) -largp
ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp
unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl -largp

ldlex.o: ldscript.c
ldlex_no_Werror = yes




get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)
allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)
line2addr_no_Wformat = yes
line2addr_LDADD = $(libdw) $(libmudflap) -largp
addrscopes_LDADD = $(libdw) $(libmudflap) -largp
funcscopes_LDADD = $(libdw) $(libmudflap) -largp
funcretval_LDADD = $(libdw) $(libmudflap) -largp
allregs_LDADD = $(libdw) $(libmudflap) -largp
find_prologues_LDADD = $(libdw) $(libmudflap) -largp
#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)
asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl

asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -largp
rdwrmmap_LDADD = $(libelf) $(libmudflap)
dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
arls_LDADD = $(libelf) $(libmudflap)
dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -largp
dwarf_getmacros_LDADD = $(libdw) $(libmudflap)
dwarf_getstring_LDADD = $(libdw) $(libmudflap)
addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -largp
test_flag_nobits_LDADD = $(libelf) $(libmudflap)
rerequest_tag_LDADD = $(libdw) $(libmudflap)
alldts_LDADD = $(libebl) $(libelf) $(libmudflap)
md5_sha1_test_LDADD = $(libeu)
typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)
low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap) -largp
test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)

if GCOV

Return to bug 470884

Lines 95-120 Link Here

(-)elfutils-0.155.orig/src/Makefile.am (-14 / +14 lines)
95	# XXX While the file is not finished, don't warn about this	95	# XXX While the file is not finished, don't warn about this
96	ldgeneric_no_Wunused = yes	96	ldgeneric_no_Wunused = yes
97		97
98	readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	98	readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
99	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \	99	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp \
100	$(demanglelib)	100	$(demanglelib)
101	size_LDADD = $(libelf) $(libeu) $(libmudflap)	101	size_LDADD = $(libelf) $(libeu) $(libmudflap) -largp
102	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	102	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
103	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	103	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
104	if NATIVE_LD	104	if NATIVE_LD
105	# -ldl is always needed for libebl.	105	# -ldl is always needed for libebl.
106	ld_LDADD += libld_elf.a	106	ld_LDADD += libld_elf.a
107	endif	107	endif
108	ld_LDFLAGS = -rdynamic	108	ld_LDFLAGS = -rdynamic
109	elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	109	elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
110	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)	110	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) -largp
111	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)	111	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) -largp
112	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl	112	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl -largp
113	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	113	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -largp
114	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)	114	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp
115	strings_LDADD = $(libelf) $(libeu) $(libmudflap)	115	strings_LDADD = $(libelf) $(libeu) $(libmudflap) -largp
116	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)	116	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -largp
117	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl	117	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl -largp
118		118
119	ldlex.o: ldscript.c	119	ldlex.o: ldscript.c
120	ldlex_no_Werror = yes	120	ldlex_no_Werror = yes

Lines 243-254 Link Here

(-)elfutils-0.155.orig/tests/Makefile.am (-10 / +10 lines)
243	get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)	243	get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)
244	allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)	244	allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)
245	line2addr_no_Wformat = yes	245	line2addr_no_Wformat = yes
246	line2addr_LDADD = $(libdw) $(libmudflap)	246	line2addr_LDADD = $(libdw) $(libmudflap) -largp
247	addrscopes_LDADD = $(libdw) $(libmudflap)	247	addrscopes_LDADD = $(libdw) $(libmudflap) -largp
248	funcscopes_LDADD = $(libdw) $(libmudflap)	248	funcscopes_LDADD = $(libdw) $(libmudflap) -largp
249	funcretval_LDADD = $(libdw) $(libmudflap)	249	funcretval_LDADD = $(libdw) $(libmudflap) -largp
250	allregs_LDADD = $(libdw) $(libmudflap)	250	allregs_LDADD = $(libdw) $(libmudflap) -largp
251	find_prologues_LDADD = $(libdw) $(libmudflap)	251	find_prologues_LDADD = $(libdw) $(libmudflap) -largp
252	#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)	252	#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)
253	asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	253	asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
254	asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	254	asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
Lines 259-281 Link Here
259	asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	259	asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
260	asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	260	asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
261	asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	261	asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
262	dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	262	dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -largp
263	rdwrmmap_LDADD = $(libelf) $(libmudflap)	263	rdwrmmap_LDADD = $(libelf) $(libmudflap)
264	dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	264	dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
265	arls_LDADD = $(libelf) $(libmudflap)	265	arls_LDADD = $(libelf) $(libmudflap)
266	dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	266	dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
267	dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	267	dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
268	dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	268	dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
269	dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	269	dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -largp
270	dwarf_getmacros_LDADD = $(libdw) $(libmudflap)	270	dwarf_getmacros_LDADD = $(libdw) $(libmudflap)
271	dwarf_getstring_LDADD = $(libdw) $(libmudflap)	271	dwarf_getstring_LDADD = $(libdw) $(libmudflap)
272	addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	272	addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -largp
273	test_flag_nobits_LDADD = $(libelf) $(libmudflap)	273	test_flag_nobits_LDADD = $(libelf) $(libmudflap)
274	rerequest_tag_LDADD = $(libdw) $(libmudflap)	274	rerequest_tag_LDADD = $(libdw) $(libmudflap)
275	alldts_LDADD = $(libebl) $(libelf) $(libmudflap)	275	alldts_LDADD = $(libebl) $(libelf) $(libmudflap)
276	md5_sha1_test_LDADD = $(libeu)	276	md5_sha1_test_LDADD = $(libeu)
277	typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)	277	typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)
278	low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap)	278	low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap) -largp
279	test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)	279	test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)
280		280
281	if GCOV	281	if GCOV