Attachment #350478 for bug #470884

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

and this patch




AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)

dnl Check if we have argp available from our libc
AC_LINK_IFELSE(
	[AC_LANG_PROGRAM(
		[#include <argp.h>],
		[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]
		)],
	[libc_has_argp="true"],
	[libc_has_argp="false"]
)

dnl If our libc doesn't provide argp, then test for libargp
if test "$libc_has_argp" = "false" ; then
	AC_MSG_WARN("libc does not have argp")
	AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"])

	if test "$have_argp" = "false"; then
		AC_MSG_ERROR("no libargp found")
	else
		argp_LDADD="-largp"
	fi
else
	argp_LDADD=""
fi
AC_SUBST([argp_LDADD])


dnl Check for __mempcpy
AC_CHECK_FUNCS_ONCE([__mempcpy])


Lines 111-117 libdw.so: $(srcdir)/libdw.map libdw_pic.a \ Link Here

(-)a/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 $(argp_LDADD) $(zip_LIBS)
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) $(argp_LDADD) -ldl
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl \
	   $(demanglelib)
size_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
if NATIVE_LD
# -ldl is always needed for libebl.
ld_LDADD += libld_elf.a
endif
ld_LDFLAGS = -rdynamic
elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) -ldl

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) $(argp_LDADD)
addrscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
funcscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
funcretval_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
allregs_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
find_prologues_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
#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) $(argp_LDADD) -ldl
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) $(argp_LDADD) -ldl
dwarf_getmacros_LDADD = $(libdw) $(libmudflap)
dwarf_getstring_LDADD = $(libdw) $(libmudflap)
addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
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) $(argp_LDADD)
test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)
dwflsyms_LDADD = $(libdw) $(libelf) $(libmudflap)
dwfllines_LDADD = $(libdw) $(libelf) $(libmudflap)
- 

Return to bug 470884

Lines 233-238 AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl Link Here

(-)a/configure.ac (+26 lines)
233	AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])	233	AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
234	AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)	234	AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)
235		235
		236	dnl Check if we have argp available from our libc
		237	AC_LINK_IFELSE(
		238	[AC_LANG_PROGRAM(
		239	[#include <argp.h>],
		240	[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]
		241	)],
		242	[libc_has_argp="true"],
		243	[libc_has_argp="false"]
		244	)
		245
		246	dnl If our libc doesn't provide argp, then test for libargp
		247	if test "$libc_has_argp" = "false" ; then
		248	AC_MSG_WARN("libc does not have argp")
		249	AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"])
		250
		251	if test "$have_argp" = "false"; then
		252	AC_MSG_ERROR("no libargp found")
		253	else
		254	argp_LDADD="-largp"
		255	fi
		256	else
		257	argp_LDADD=""
		258	fi
		259	AC_SUBST([argp_LDADD])
		260
		261
236	dnl Check for __mempcpy	262	dnl Check for __mempcpy
237	AC_CHECK_FUNCS_ONCE([__mempcpy])	263	AC_CHECK_FUNCS_ONCE([__mempcpy])
238		264

Lines 95-120 addr2line_no_Wformat = yes Link Here

(-)a/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) $(argp_LDADD) -ldl
99	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \	99	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl \
100	$(demanglelib)	100	$(demanglelib)
101	size_LDADD = $(libelf) $(libeu) $(libmudflap)	101	size_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
102	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	102	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
103	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	103	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
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) $(argp_LDADD) -ldl
110	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)	110	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
111	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)	111	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
112	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl	112	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
113	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	113	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
114	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)	114	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
115	strings_LDADD = $(libelf) $(libeu) $(libmudflap)	115	strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
116	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)	116	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
117	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl	117	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
118		118
119	ldlex.o: ldscript.c	119	ldlex.o: ldscript.c
120	ldlex_no_Werror = yes	120	ldlex_no_Werror = yes

Lines 288-299 get_files_LDADD = $(libdw) $(libelf) $(libmudflap) Link Here

(-)a/tests/Makefile.am (-11 / +10 lines)
288	get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)	288	get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)
289	allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)	289	allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)
290	line2addr_no_Wformat = yes	290	line2addr_no_Wformat = yes
291	line2addr_LDADD = $(libdw) $(libmudflap)	291	line2addr_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
292	addrscopes_LDADD = $(libdw) $(libmudflap)	292	addrscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
293	funcscopes_LDADD = $(libdw) $(libmudflap)	293	funcscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
294	funcretval_LDADD = $(libdw) $(libmudflap)	294	funcretval_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
295	allregs_LDADD = $(libdw) $(libmudflap)	295	allregs_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
296	find_prologues_LDADD = $(libdw) $(libmudflap)	296	find_prologues_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
297	#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)	297	#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)
298	asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	298	asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
299	asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	299	asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
Lines 304-326 asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl Link Here
304	asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	304	asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
305	asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	305	asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
306	asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	306	asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
307	dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	307	dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
308	rdwrmmap_LDADD = $(libelf) $(libmudflap)	308	rdwrmmap_LDADD = $(libelf) $(libmudflap)
309	dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	309	dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
310	arls_LDADD = $(libelf) $(libmudflap)	310	arls_LDADD = $(libelf) $(libmudflap)
311	dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	311	dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
312	dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	312	dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
313	dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	313	dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
314	dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	314	dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
315	dwarf_getmacros_LDADD = $(libdw) $(libmudflap)	315	dwarf_getmacros_LDADD = $(libdw) $(libmudflap)
316	dwarf_getstring_LDADD = $(libdw) $(libmudflap)	316	dwarf_getstring_LDADD = $(libdw) $(libmudflap)
317	addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	317	addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
318	test_flag_nobits_LDADD = $(libelf) $(libmudflap)	318	test_flag_nobits_LDADD = $(libelf) $(libmudflap)
319	rerequest_tag_LDADD = $(libdw) $(libmudflap)	319	rerequest_tag_LDADD = $(libdw) $(libmudflap)
320	alldts_LDADD = $(libebl) $(libelf) $(libmudflap)	320	alldts_LDADD = $(libebl) $(libelf) $(libmudflap)
321	md5_sha1_test_LDADD = $(libeu)	321	md5_sha1_test_LDADD = $(libeu)
322	typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)	322	typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)
323	low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap)	323	low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
324	test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)	324	test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)
325	dwflsyms_LDADD = $(libdw) $(libelf) $(libmudflap)	325	dwflsyms_LDADD = $(libdw) $(libelf) $(libmudflap)
326	dwfllines_LDADD = $(libdw) $(libelf) $(libmudflap)	326	dwfllines_LDADD = $(libdw) $(libelf) $(libmudflap)
327	-