Attachment #376194 for bug #470884

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

and this patch




fi
AC_SUBST([argp_LDADD])

dnl Check if we have dgettext available from our libc
AC_LINK_IFELSE(
	[AC_LANG_PROGRAM(
		[#include <libintl.h>],
		[char *test=dgettext("test","test"); return 0;]
		)],
	[libc_has_dgettext="true"],
	[libc_has_dgettext="false"]
)

dnl If our libc doesn't provide dgettext, then test for libintl support
if test "$libc_has_dgettext" = "false" ; then
	OLD_LIBS="$LIBS"
	LIBS="$OLD_LIBS -lintl"
	AC_MSG_WARN("libc does not have dgettext")
	AC_LINK_IFELSE(
        	[AC_LANG_PROGRAM(
        	        [#include <libintl.h>],
        	        [char *test=dgettext("test","test"); return 0;]
        	        )],
        	[libintl_has_dgettext="true"],
        	[libintl_has_dgettext="false"]
	)
	if test "$libintl_has_dgettext" = "false"; then
		AC_MSG_ERROR("no libintl with dgettext found")
	else
		intl_LDADD="-lintl"
	fi
	LIBS="$OLD_LIBS"
else
	intl_LDADD=""
fi
AC_SUBST([intl_LDADD])


dnl Check for __mempcpy
AC_CHECK_FUNCS_ONCE([__mempcpy])

Lines 59-64 libasm_pic_a_SOURCES = Link Here

(-)a/libasm/Makefile.am (+1 lines)
59	am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)	59	am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os)
60		60
61	libasm_so_LDLIBS =	61	libasm_so_LDLIBS =
		62	libasm_so_LDLIBS += $(intl_LDADD)
62	if USE_LOCKS	63	if USE_LOCKS
63	libasm_so_LDLIBS += -lpthread	64	libasm_so_LDLIBS += -lpthread
64	endif	65	endif

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 $(argp_LDADD) $(zip_LIBS)	114	-ldl $(argp_LDADD) $(intl_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

Lines 97-102 libelf_pic_a_SOURCES = Link Here

(-)a/libelf/Makefile.am (+1 lines)
97	am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)	97	am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os)
98		98
99	libelf_so_LDLIBS =	99	libelf_so_LDLIBS =
		100	libelf_so_LDLIBS += $(intl_LDADD)
100	if USE_LOCKS	101	if USE_LOCKS
101	libelf_so_LDLIBS += -lpthread	102	libelf_so_LDLIBS += -lpthread
102	endif	103	endif




# Buggy old compilers.
readelf_no_Werror = yes

readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl \
	   $(demanglelib)
size_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_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) $(intl_LDADD) -ldl
findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_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) $(intl_LDADD)
addrscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
funcscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
funcretval_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
allregs_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
find_prologues_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_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) $(intl_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) $(intl_LDADD) -ldl
dwarf_getmacros_LDADD = $(libdw) $(libmudflap)
dwarf_getstring_LDADD = $(libdw) $(libmudflap)
addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_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) $(intl_LDADD)
test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap)
dwflsyms_LDADD = $(libdw) $(libelf) $(libmudflap)
dwfllines_LDADD = $(libdw) $(libelf) $(libmudflap)

Return to bug 470884

Lines 326-331 else Link Here

(-)a/configure.ac (+34 lines)
326	fi	326	fi
327	AC_SUBST([argp_LDADD])	327	AC_SUBST([argp_LDADD])
328		328
		329	dnl Check if we have dgettext available from our libc
		330	AC_LINK_IFELSE(
		331	[AC_LANG_PROGRAM(
		332	[#include <libintl.h>],
		333	[char *test=dgettext("test","test"); return 0;]
		334	)],
		335	[libc_has_dgettext="true"],
		336	[libc_has_dgettext="false"]
		337	)
		338
		339	dnl If our libc doesn't provide dgettext, then test for libintl support
		340	if test "$libc_has_dgettext" = "false" ; then
		341	OLD_LIBS="$LIBS"
		342	LIBS="$OLD_LIBS -lintl"
		343	AC_MSG_WARN("libc does not have dgettext")
		344	AC_LINK_IFELSE(
		345	[AC_LANG_PROGRAM(
		346	[#include <libintl.h>],
		347	[char *test=dgettext("test","test"); return 0;]
		348	)],
		349	[libintl_has_dgettext="true"],
		350	[libintl_has_dgettext="false"]
		351	)
		352	if test "$libintl_has_dgettext" = "false"; then
		353	AC_MSG_ERROR("no libintl with dgettext found")
		354	else
		355	intl_LDADD="-lintl"
		356	fi
		357	LIBS="$OLD_LIBS"
		358	else
		359	intl_LDADD=""
		360	fi
		361	AC_SUBST([intl_LDADD])
		362
329		363
330	dnl Check for __mempcpy	364	dnl Check for __mempcpy
331	AC_CHECK_FUNCS_ONCE([__mempcpy])	365	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		100
101	readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl	101	readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
102	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl \	102	nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl \
103	$(demanglelib)	103	$(demanglelib)
104	size_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)	104	size_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
105	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl	105	strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
106	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl	106	ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
107	if NATIVE_LD	107	if NATIVE_LD
108	# -ldl is always needed for libebl.	108	# -ldl is always needed for libebl.
109	ld_LDADD += libld_elf.a	109	ld_LDADD += libld_elf.a
110	endif	110	endif
111	ld_LDFLAGS = -rdynamic	111	ld_LDFLAGS = -rdynamic
112	elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl	112	elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
113	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)	113	findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
114	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD)	114	addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
115	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) -ldl	115	elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
116	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) -ldl	116	objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
117	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)	117	ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
118	strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)	118	strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
119	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD)	119	ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
120	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) -ldl	120	unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl
121	stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) -ldl \	121	stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) $(argp_LDADD) $(intl_LDADD) -ldl \
122	$(demanglelib)	122	$(demanglelib)
123		123
124	ldlex.o: ldscript.c	124	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) $(argp_LDADD)	349	line2addr_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
350	addrscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)	350	addrscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
351	funcscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)	351	funcscopes_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
352	funcretval_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)	352	funcretval_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
353	allregs_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)	353	allregs_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_LDADD)
354	find_prologues_LDADD = $(libdw) $(libmudflap) $(argp_LDADD)	354	find_prologues_LDADD = $(libdw) $(libmudflap) $(argp_LDADD) $(intl_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) $(argp_LDADD) -ldl	365	dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_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) $(argp_LDADD) -ldl	372	dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_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) $(argp_LDADD) -ldl	375	addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_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) $(argp_LDADD)	382	low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap) $(argp_LDADD) $(intl_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)