Attachment #376196 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)




# Buggy old compilers.
readelf_no_Werror = 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
stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) -ldl \
	      $(demanglelib)
ldlex.o: ldscript.c




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)
typeiter2_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 298-303 AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl Link Here

(-)a/configure.ac (+26 lines)
298	AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])	298	AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])])
299	AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)	299	AM_CONDITIONAL(DEMANGLE, test "$ac_cv_lib_stdcpp___cxa_demangle" = yes)
		300	dnl Check if we have argp available from our libc
		301	AC_LINK_IFELSE(
		302	[AC_LANG_PROGRAM(
		303	[#include <argp.h>],
		304	[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]
		305	)],
		306	[libc_has_argp="true"],
		307	[libc_has_argp="false"]
		308	)
		309
		310	dnl If our libc doesn't provide argp, then test for libargp
		311	if test "$libc_has_argp" = "false" ; then
		312	AC_MSG_WARN("libc does not have argp")
		313	AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"])
		314
		315	if test "$have_argp" = "false"; then
		316	AC_MSG_ERROR("no libargp found")
		317	else
		318	argp_LDADD="-largp"
		319	fi
		320	else
		321	argp_LDADD=""
		322	fi
		323	AC_SUBST([argp_LDADD])
		324
		325
300	dnl Check for __mempcpy	326	dnl Check for __mempcpy
301	AC_CHECK_FUNCS_ONCE([__mempcpy])	327	AC_CHECK_FUNCS_ONCE([__mempcpy])

Lines 98-124 ldgeneric_no_Wunused = yes Link Here

(-)a/src/Makefile.am (-15 / +15 lines)
98	# Buggy old compilers.	98	# Buggy old compilers.
99	readelf_no_Werror = yes	99	readelf_no_Werror = yes
100	readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	100	readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
101	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \	101	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl \
102	$(demanglelib)	102	$(demanglelib)
103	size_LDADD = $(libelf) $(libeu) $(libmudflap)	103	size_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
104	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	104	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
105	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	105	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
106	if NATIVE_LD	106	if NATIVE_LD
107	# -ldl is always needed for libebl.	107	# -ldl is always needed for libebl.
108	ld_LDADD += libld_elf.a	108	ld_LDADD += libld_elf.a
109	endif	109	endif
110	ld_LDFLAGS = -rdynamic	110	ld_LDFLAGS = -rdynamic
111	elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	111	elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
112	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)	112	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
113	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)	113	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
114	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl	114	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
115	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl	115	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
116	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)	116	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
117	strings_LDADD = $(libelf) $(libeu) $(libmudflap)	117	strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
118	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)	118	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)
119	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl	119	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) -ldl
120	stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \	120	stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) -ldl \
121	$(demanglelib)	121	$(demanglelib)
122	ldlex.o: ldscript.c	122	ldlex.o: ldscript.c

Lines 346-357 get_files_LDADD = $(libdw) $(libelf) $(libmudflap) Link Here

(-)a/tests/Makefile.am (-10 / +10 lines)
346	get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)	346	get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap)
347	allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)	347	allfcts_LDADD = $(libdw) $(libelf) $(libmudflap)
348	line2addr_no_Wformat = yes	348	line2addr_no_Wformat = yes
349	line2addr_LDADD = $(libdw) $(libmudflap)	349	line2addr_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
350	addrscopes_LDADD = $(libdw) $(libmudflap)	350	addrscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
351	funcscopes_LDADD = $(libdw) $(libmudflap)	351	funcscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
352	funcretval_LDADD = $(libdw) $(libmudflap)	352	funcretval_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
353	allregs_LDADD = $(libdw) $(libmudflap)	353	allregs_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
354	find_prologues_LDADD = $(libdw) $(libmudflap)	354	find_prologues_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)
355	#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)	355	#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap)
356	asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	356	asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
357	asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	357	asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
Lines 362-385 asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl Link Here
362	asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	362	asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
363	asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	363	asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
364	asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl	364	asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
365	dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	365	dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
366	rdwrmmap_LDADD = $(libelf) $(libmudflap)	366	rdwrmmap_LDADD = $(libelf) $(libmudflap)
367	dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	367	dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
368	arls_LDADD = $(libelf) $(libmudflap)	368	arls_LDADD = $(libelf) $(libmudflap)
369	dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	369	dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
370	dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	370	dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
371	dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	371	dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
372	dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	372	dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
373	dwarf_getmacros_LDADD = $(libdw) $(libmudflap)	373	dwarf_getmacros_LDADD = $(libdw) $(libmudflap)
374	dwarf_getstring_LDADD = $(libdw) $(libmudflap)	374	dwarf_getstring_LDADD = $(libdw) $(libmudflap)
375	addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl	375	addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl
376	test_flag_nobits_LDADD = $(libelf) $(libmudflap)	376	test_flag_nobits_LDADD = $(libelf) $(libmudflap)
377	rerequest_tag_LDADD = $(libdw) $(libmudflap)	377	rerequest_tag_LDADD = $(libdw) $(libmudflap)
378	alldts_LDADD = $(libebl) $(libelf) $(libmudflap)	378	alldts_LDADD = $(libebl) $(libelf) $(libmudflap)
379	md5_sha1_test_LDADD = $(libeu)	379	md5_sha1_test_LDADD = $(libeu)
380	typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)	380	typeiter_LDADD = $(libdw) $(libelf) $(libmudflap)
381	typeiter2_LDADD = $(libdw) $(libelf) $(libmudflap)	381	typeiter2_LDADD = $(libdw) $(libelf) $(libmudflap)
382	low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap)	382	low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)
383	test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)	383	test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)
384	dwflsyms_LDADD = $(libdw) $(libelf) $(libmudflap)	384	dwflsyms_LDADD = $(libdw) $(libelf) $(libmudflap)
385	dwfllines_LDADD = $(libdw) $(libelf) $(libmudflap)	385	dwfllines_LDADD = $(libdw) $(libelf) $(libmudflap)