This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Re: [gold][patch][testsuite] Fix nonexisting .c default _SOURCES
On Mon, 11 Oct 2010 19:35:25 +0200, Ralf Wildenhues wrote:
> * Jan Kratochvil wrote on Sun, Oct 10, 2010 at 11:21:16PM CEST:
> > On Sun, 10 Oct 2010 20:01:51 +0200, Ralf Wildenhues wrote:
> > There is a problem that for unsatisfied AM_CONDITIONALs the files are not
> > listed for `make tags'.
[...]
> Oh. Are you saying there is an Automake bug involved here?
Maybe, posted now to bug-automake as:
Subject: even `if FALSE' *_SOURCES should be used for TAGS
> > `make tags' now lists all the persent *.{cc,c,h} files. I did not intend to
> > create such patch first.
>
> Why are you interested at all in 'make tags' being complete for test
> suite files?
Not at all. But currently `make tags' errors out when run from src/ . So it
has to work some way in gold/testsuite/ . If some file TAGS gets created
I believe it should be a correct one. With empty *_SOURCES TAGS gets created
but TAGS is not correct/complete.
> and fairly uninteresting for the rest of the code, no?
I agree the gold/testsuite/Makefile.am simplicity should be preferred over the
gold/testsuite/TAGS completeness. Therefore posting an alternative patch
which just disables `make tags' for gold/testsuite/ but does not error on it.
> > Some Makefile.in rules now contain $(CXXLINK) instead of $(LINK) but those
> > rules are always overriden by Makefile.am anyway (which uses $(CXXLINK)).
>
> Erm, if the automake-generated rules appear in Makefile.in, then they
> haven't been overridden by rules from Makefile.am; automake is usually
> careful to not add any generated rules for which the user has written
> any herself.
I have noticed now that still it creates the default automake rules in the
other `if' blocks (@X_FALSE@ vs. @X_TRUE@); posted now to bug-automake as:
Subject: even @C_FALSE@ (unsatisfied) contains rule to produce binary
Thanks,
Jan
gold/
2010-10-10 Jan Kratochvil <jan.kratochvil@redhat.com>
Jiang Jilin <freephp@gmail.com>
* testsuite/Makefile.am (ID tags TAGS ctags CTAGS)
(icf_virtual_function_folding_test_SOURCES basic_test_SOURCES)
(basic_static_test_SOURCES basic_pic_test_SOURCES)
(basic_static_pic_test_SOURCES basic_pie_test_SOURCES)
(two_file_pie_test_SOURCES two_file_mixed_pie_test_SOURCES)
(two_file_strip_test_SOURCES weak_plt_SOURCES tls_pie_test_SOURCES)
(tls_pie_pic_test_SOURCES many_sections_r_test_SOURCES)
(flagstest_o_specialfile_SOURCES)
(flagstest_compress_debug_sections_SOURCES)
(flagstest_o_specialfile_and_compress_debug_sections_SOURCES)
(script_test_3_SOURCES plugin_test_1_SOURCES plugin_test_2_SOURCES)
(plugin_test_3_SOURCES plugin_test_4_SOURCES plugin_test_5_SOURCES)
(plugin_test_6_SOURCES plugin_test_7_SOURCES plugin_test_8_SOURCES)
(local_labels_test_SOURCES permission_test_SOURCES)
(ifuncmain1picstatic_SOURCES ifuncmain1pic_SOURCES)
(ifuncmain1vispic_SOURCES ifuncmain1staticpic_SOURCES)
(ifuncmain1pie_SOURCES ifuncmain1vispie_SOURCES)
(ifuncmain1staticpie_SOURCES ifuncmain2picstatic_SOURCES)
(ifuncmain2pic_SOURCES ifuncmain4picstatic_SOURCES)
(ifuncmain5picstatic_SOURCES ifuncmain5pic_SOURCES)
(ifuncmain5staticpic_SOURCES ifuncmain5pie_SOURCES)
(ifuncmain7picstatic_SOURCES ifuncmain7pic_SOURCES)
(ifuncmain7pie_SOURCES start_lib_test_SOURCES): New as empty.
* testsuite/Makefile.in: Regenerate.
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -56,6 +56,14 @@ BUILT_SOURCES =
TESTS = $(check_SCRIPTS) $(check_PROGRAMS)
+
+# *_SOURCES definitions are not complete.
+ID:
+tags:
+TAGS:
+ctags:
+CTAGS:
+
# ---------------------------------------------------------------------
# These tests test the internals of gold (unittests).
@@ -206,6 +214,7 @@ final_layout.stdout: final_layout
$(TEST_NM) final_layout > final_layout.stdout
check_PROGRAMS += icf_virtual_function_folding_test
+icf_virtual_function_folding_test_SOURCES =
MOSTLYCLEANFILES += icf_virtual_function_folding_test
icf_virtual_function_folding_test.o: icf_virtual_function_folding_test.cc
$(CXXCOMPILE) -O0 -c -ffunction-sections -fPIE -g -o $@ $<
@@ -245,9 +254,13 @@ icf_sht_rel_addend_test.stdout: icf_sht_rel_addend_test
$(TEST_NM) icf_sht_rel_addend_test > icf_sht_rel_addend_test.stdout
check_PROGRAMS += basic_test
+basic_test_SOURCES =
check_PROGRAMS += basic_static_test
+basic_static_test_SOURCES =
check_PROGRAMS += basic_pic_test
+basic_pic_test_SOURCES =
check_PROGRAMS += basic_static_pic_test
+basic_static_pic_test_SOURCES =
basic_test.o: basic_test.cc
$(CXXCOMPILE) -O0 -c -o $@ $<
basic_test: basic_test.o gcctestdir/ld
@@ -263,6 +276,7 @@ basic_static_pic_test: basic_pic_test.o gcctestdir/ld
$(CXXLINK) -Bgcctestdir/ -static basic_pic_test.o
check_PROGRAMS += basic_pie_test
+basic_pie_test_SOURCES =
basic_pie_test.o: basic_test.cc
$(CXXCOMPILE) -O0 -c -fpie -o $@ $<
basic_pie_test: basic_pie_test.o gcctestdir/ld
@@ -377,6 +391,7 @@ two_file_relocatable.o: gcctestdir/ld two_file_test_1.o two_file_test_1b.o two_f
gcctestdir/ld -r -o $@ two_file_test_1.o two_file_test_1b.o two_file_test_2.o
check_PROGRAMS += two_file_pie_test
+two_file_pie_test_SOURCES =
two_file_test_1_pie.o: two_file_test_1.cc
$(CXXCOMPILE) -c -fpie -o $@ $<
two_file_test_1b_pie.o: two_file_test_1b.cc
@@ -462,6 +477,7 @@ two_file_mixed_2_shared_test_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
two_file_mixed_2_shared_test_LDADD = two_file_shared_mixed_1.so two_file_shared_2.so
check_PROGRAMS += two_file_mixed_pie_test
+two_file_mixed_pie_test_SOURCES =
two_file_mixed_pie_test: two_file_test_1.o two_file_test_1b_pie.o \
two_file_test_main_pie.o two_file_shared_2.so gcctestdir/ld
$(CXXLINK) -Bgcctestdir/ -Wl,-R,. -pie two_file_test_1.o two_file_test_1b_pie.o two_file_test_main_pie.o two_file_shared_2.so
@@ -469,6 +485,7 @@ two_file_mixed_pie_test: two_file_test_1.o two_file_test_1b_pie.o \
endif FN_PTRS_IN_SO_WITHOUT_PIC
check_PROGRAMS += two_file_strip_test
+two_file_strip_test_SOURCES =
two_file_strip_test: two_file_test
$(TEST_STRIP) -o two_file_strip_test two_file_test
@@ -630,6 +647,7 @@ weak_alias_test_4.so: weak_alias_test_4_pic.o gcctestdir/ld
check_SCRIPTS += weak_plt.sh
check_PROGRAMS += weak_plt
+weak_plt_SOURCES =
check_DATA += weak_plt_shared.so
weak_plt_main_pic.o: weak_plt_main.cc
$(CXXCOMPILE) -c -fpic -o $@ $<
@@ -659,7 +677,9 @@ if TLS
check_PROGRAMS += tls_test
check_PROGRAMS += tls_pic_test
check_PROGRAMS += tls_pie_test
+tls_pie_test_SOURCES =
check_PROGRAMS += tls_pie_pic_test
+tls_pie_pic_test_SOURCES =
check_PROGRAMS += tls_shared_test
check_PROGRAMS += tls_shared_ie_test
check_PROGRAMS += tls_shared_gd_to_ie_test
@@ -817,6 +837,7 @@ many_sections_check.h:
mv -f $@.tmp $@
check_PROGRAMS += many_sections_r_test
+many_sections_r_test_SOURCES =
many_sections_r_test.o: many_sections_test.o gcctestdir/ld
gcctestdir/ld -r -o $@ many_sections_test.o
many_sections_r_test: many_sections_r_test.o gcctestdir/ld
@@ -912,6 +933,7 @@ undef_symbol.err: undef_symbol_main.o undef_symbol.so gcctestdir/ld
# Test -o when emitting to a special file (such as something in /dev).
check_PROGRAMS += flagstest_o_specialfile
+flagstest_o_specialfile_SOURCES =
flagstest_o_specialfile: flagstest_debug.o gcctestdir/ld
$(CXXLINK) -Bgcctestdir/ -o /dev/stdout $< 2>&1 | cat > $@
chmod a+x $@
@@ -921,6 +943,7 @@ if HAVE_ZLIB
# Test --compress-debug-sections. FIXME: check we actually compress.
check_PROGRAMS += flagstest_compress_debug_sections
+flagstest_compress_debug_sections_SOURCES =
flagstest_compress_debug_sections: flagstest_debug.o gcctestdir/ld
$(CXXLINK) -Bgcctestdir/ -o $@ $< -Wl,--compress-debug-sections=zlib
test -s $@
@@ -929,6 +952,7 @@ flagstest_compress_debug_sections: flagstest_debug.o gcctestdir/ld
# The specialfile output has a tricky case when we also compress debug
# sections, because it requires output-file resizing.
check_PROGRAMS += flagstest_o_specialfile_and_compress_debug_sections
+flagstest_o_specialfile_and_compress_debug_sections_SOURCES =
flagstest_o_specialfile_and_compress_debug_sections: flagstest_debug.o \
gcctestdir/ld
$(CXXLINK) -Bgcctestdir/ -o /dev/stdout $< -Wl,--compress-debug-sections=zlib 2>&1 | cat > $@
@@ -1142,6 +1166,7 @@ ver_matching_test.stdout: ver_matching_def.so
$(TEST_OBJDUMP) -T ver_matching_def.so | $(TEST_CXXFILT) > ver_matching_test.stdout
check_PROGRAMS += script_test_3
+script_test_3_SOURCES =
check_SCRIPTS += script_test_3.sh
check_DATA += script_test_3.stdout
MOSTLYCLEANFILES += script_test_3.stdout
@@ -1270,6 +1295,7 @@ alt/thin_archive_test_4.o: thin_archive_test_4.cc
if PLUGINS
check_PROGRAMS += plugin_test_1
+plugin_test_1_SOURCES =
check_SCRIPTS += plugin_test_1.sh
check_DATA += plugin_test_1.err
MOSTLYCLEANFILES += plugin_test_1.err
@@ -1279,6 +1305,7 @@ plugin_test_1.err: plugin_test_1
@touch plugin_test_1.err
check_PROGRAMS += plugin_test_2
+plugin_test_2_SOURCES =
check_SCRIPTS += plugin_test_2.sh
check_DATA += plugin_test_2.err
MOSTLYCLEANFILES += plugin_test_2.err
@@ -1288,6 +1315,7 @@ plugin_test_2.err: plugin_test_2
@touch plugin_test_2.err
check_PROGRAMS += plugin_test_3
+plugin_test_3_SOURCES =
check_SCRIPTS += plugin_test_3.sh
check_DATA += plugin_test_3.err
MOSTLYCLEANFILES += plugin_test_3.err
@@ -1297,6 +1325,7 @@ plugin_test_3.err: plugin_test_3
@touch plugin_test_3.err
check_PROGRAMS += plugin_test_4
+plugin_test_4_SOURCES =
check_SCRIPTS += plugin_test_4.sh
check_DATA += plugin_test_4.err
MOSTLYCLEANFILES += plugin_test_4.a plugin_test_4.err
@@ -1309,10 +1338,12 @@ plugin_test_4.a: two_file_test_1.syms two_file_test_1b.syms two_file_test_2.syms
$(TEST_AR) cr $@ $^
check_PROGRAMS += plugin_test_5
+plugin_test_5_SOURCES =
plugin_test_5: two_file_test_main.o two_file_test_1.syms two_file_test_1b.syms two_file_test_2.syms unused.syms gcctestdir/ld plugin_test.so
$(CXXLINK) -Bgcctestdir/ -Wl,--no-demangle,--plugin,"./plugin_test.so",--plugin-opt,"_Z4f13iv",--gc-sections two_file_test_main.o two_file_test_1.syms two_file_test_1b.syms two_file_test_2.syms unused.syms
check_PROGRAMS += plugin_test_6
+plugin_test_6_SOURCES =
check_SCRIPTS += plugin_test_6.sh
check_DATA += plugin_test_6.err
MOSTLYCLEANFILES += plugin_test_6.err
@@ -1322,6 +1353,7 @@ plugin_test_6.err: plugin_test_6
@touch plugin_test_6.err
check_PROGRAMS += plugin_test_7
+plugin_test_7_SOURCES =
check_SCRIPTS += plugin_test_7.sh
check_DATA += plugin_test_7.err plugin_test_7.syms
MOSTLYCLEANFILES += plugin_test_7.err
@@ -1341,6 +1373,7 @@ plugin_test_7.err: plugin_test_7
# Test plugins with -r.
check_PROGRAMS += plugin_test_8
+plugin_test_8_SOURCES =
plugin_test_8.o: two_file_test_main.o two_file_test_1.syms two_file_test_1b.syms two_file_test_2.o ../ld-new plugin_test.so
../ld-new -r -o $@ --no-demangle --plugin "./plugin_test.so" two_file_test_main.o two_file_test_1.syms two_file_test_1b.syms two_file_test_2.o
plugin_test_8: plugin_test_8.o gcctestdir/ld
@@ -1424,6 +1457,7 @@ alt/libexclude_libs_test_3.a: exclude_libs_test_3.o
$(TEST_AR) rc $@ $^
check_PROGRAMS += local_labels_test
+local_labels_test_SOURCES =
local_labels_test.o: ver_test_6.c
$(COMPILE) -g -c -Wa,-L -o $@ $<
local_labels_test: local_labels_test.o
@@ -1500,6 +1534,7 @@ retain_symbols_file_test.stdout: retain_symbols_file_test.so
# Test that if the output file already exists and is empty,
# it will get execute permission.
check_PROGRAMS += permission_test
+permission_test_SOURCES =
permission_test: basic_test.o gcctestdir/ld
umask 022; \
rm -f $@; \
@@ -1558,6 +1593,7 @@ ifuncmain1static_LDFLAGS = -Bgcctestdir/ -static
ifuncmain1static_LDADD = ifuncdep1.o
check_PROGRAMS += ifuncmain1picstatic
+ifuncmain1picstatic_SOURCES =
ifuncmain1picstatic: ifuncmain1pic.o ifuncmod1.o gcctestdir/ld
$(LINK) -Bgcctestdir/ -static ifuncmain1pic.o ifuncmod1.o
@@ -1568,6 +1604,7 @@ ifuncmain1_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
ifuncmain1_LDADD = ifuncmod1.so
check_PROGRAMS += ifuncmain1pic
+ifuncmain1pic_SOURCES =
ifuncmain1pic: ifuncmain1pic.o ifuncmod1.so gcctestdir/ld
$(LINK) -Bgcctestdir/ ifuncmain1pic.o ifuncmod1.so -Wl,-R,.
@@ -1578,26 +1615,31 @@ ifuncmain1vis_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
ifuncmain1vis_LDADD = ifuncmod1.so
check_PROGRAMS += ifuncmain1vispic
+ifuncmain1vispic_SOURCES =
ifuncmain1vispic.o: ifuncmain1vis.c
$(COMPILE) -c -fpic -o $@ $<
ifuncmain1vispic: ifuncmain1vispic.o ifuncmod1.so gcctestdir/ld
$(LINK) -Bgcctestdir/ ifuncmain1pic.o ifuncmod1.so -Wl,-R,.
check_PROGRAMS += ifuncmain1staticpic
+ifuncmain1staticpic_SOURCES =
ifuncmain1staticpic: ifuncmain1pic.o ifuncmod1.o gcctestdir/ld
$(LINK) -Bgcctestdir/ ifuncmain1pic.o ifuncmod1.o
check_PROGRAMS += ifuncmain1pie
+ifuncmain1pie_SOURCES =
ifuncmain1pie: ifuncmain1pie.o ifuncmod1.so gcctestdir/ld
$(LINK) -Bgcctestdir/ -pie ifuncmain1pie.o ifuncmod1.so -Wl,-R,.
check_PROGRAMS += ifuncmain1vispie
+ifuncmain1vispie_SOURCES =
ifuncmain1vispie.o: ifuncmain1vis.c
$(COMPILE) -c -fpie -o $@ $<
ifuncmain1vispie: ifuncmain1vispie.o ifuncmod1.so gcctestdir/ld
$(LINK) -Bgcctestdir/ -pie ifuncmain1vispie.o ifuncmod1.so -Wl,-R,.
check_PROGRAMS += ifuncmain1staticpie
+ifuncmain1staticpie_SOURCES =
ifuncmain1staticpie: ifuncmain1pie.o ifuncmod1.o gcctestdir/ld
$(LINK) -Bgcctestdir/ -pie ifuncmain1pie.o ifuncmod1.o
@@ -1613,6 +1655,7 @@ ifuncmain2static_DEPENDENCIES = gcctestdir/ld
ifuncmain2static_LDFLAGS = -Bgcctestdir/ -static
check_PROGRAMS += ifuncmain2picstatic
+ifuncmain2picstatic_SOURCES =
ifuncmain2picstatic: ifuncmain2pic.o ifuncdep2pic.o gcctestdir/ld
$(LINK) -Bgcctestdir/ -static ifuncmain2pic.o ifuncdep2pic.o
@@ -1622,6 +1665,7 @@ ifuncmain2_DEPENDENCIES = gcctestdir/ld
ifuncmain2_LDFLAGS = -Bgcctestdir/
check_PROGRAMS += ifuncmain2pic
+ifuncmain2pic_SOURCES =
ifuncmain2pic: ifuncmain2pic.o ifuncdep2pic.o gcctestdir/ld
$(LINK) -Bgcctestdir/ ifuncmain2pic.o ifuncdep2pic.o
@@ -1645,6 +1689,7 @@ ifuncmain4static_DEPENDENCIES = gcctestdir/ld
ifuncmain4static_LDFLAGS = -Bgcctestdir/ -static
check_PROGRAMS += ifuncmain4picstatic
+ifuncmain4picstatic_SOURCES =
ifuncmain4picstatic: ifuncmain4pic.o gcctestdir/ld
$(LINK) -Bgcctestdir/ -static ifuncmain4pic.o
@@ -1674,6 +1719,7 @@ ifuncmain5static_LDFLAGS = -Bgcctestdir/ -static
ifuncmain5static_LDADD = ifuncdep5.o
check_PROGRAMS += ifuncmain5picstatic
+ifuncmain5picstatic_SOURCES =
ifuncmain5picstatic: ifuncmain5pic.o ifuncmod5.o gcctestdir/ld
$(LINK) -Bgcctestdir/ -static ifuncmain5pic.o ifuncmod5.o
@@ -1684,14 +1730,17 @@ ifuncmain5_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
ifuncmain5_LDADD = ifuncmod5.so
check_PROGRAMS += ifuncmain5pic
+ifuncmain5pic_SOURCES =
ifuncmain5pic: ifuncmain5pic.o ifuncmod5.so gcctestdir/ld
$(LINK) -Bgcctestdir/ ifuncmain5pic.o ifuncmod5.so -Wl,-R,.
check_PROGRAMS += ifuncmain5staticpic
+ifuncmain5staticpic_SOURCES =
ifuncmain5staticpic: ifuncmain5pic.o ifuncmod5.o gcctestdir/ld
$(LINK) -Bgcctestdir/ ifuncmain5pic.o ifuncmod5.o
check_PROGRAMS += ifuncmain5pie
+ifuncmain5pie_SOURCES =
ifuncmain5pie: ifuncmain5pie.o ifuncmod5.so gcctestdir/ld
$(LINK) -Bgcctestdir/ -pie ifuncmain5pie.o ifuncmod5.so -Wl,-R,.
@@ -1719,6 +1768,7 @@ ifuncmain7static_DEPENDENCIES = gcctestdir/ld
ifuncmain7static_LDFLAGS = -Bgcctestdir/ -static
check_PROGRAMS += ifuncmain7picstatic
+ifuncmain7picstatic_SOURCES =
ifuncmain7picstatic: ifuncmain7pic.o gcctestdir/ld
$(LINK) -Bgcctestdir/ -static ifuncmain7pic.o
@@ -1728,10 +1778,12 @@ ifuncmain7_DEPENDENCIES = gcctestdir/ld
ifuncmain7_LDFLAGS = -Bgcctestdir/
check_PROGRAMS += ifuncmain7pic
+ifuncmain7pic_SOURCES =
ifuncmain7pic: ifuncmain7pic.o gcctestdir/ld
$(LINK) -Bgcctestdir/ ifuncmain7pic.o
check_PROGRAMS += ifuncmain7pie
+ifuncmain7pie_SOURCES =
ifuncmain7pie: ifuncmain7pie.o gcctestdir/ld
$(LINK) -Bgcctestdir/ -pie ifuncmain7pie.o
@@ -1777,6 +1829,7 @@ dyn_weak_ref.stdout: dyn_weak_ref_1.so
# Test that --start-lib and --end-lib function correctly.
check_PROGRAMS += start_lib_test
+start_lib_test_SOURCES =
start_lib_test: start_lib_test_main.o libstart_lib_test.a start_lib_test_2.o start_lib_test_3.o \
gcctestdir/ld
$(LINK) -Bgcctestdir/ -o $@ start_lib_test_main.o -L. -lstart_lib_test \