* gold: fix testsuite dependencies.
@ 2010-12-15 19:31 Ralf Wildenhues
2010-12-16 4:25 ` Ian Lance Taylor
0 siblings, 1 reply; 3+ messages in thread
From: Ralf Wildenhues @ 2010-12-15 19:31 UTC (permalink / raw)
To: binutils
This patch avoids a link error with 'make -j2 check': all programs in
testsuite/ which do not have a *_LDADD statement use the default LDADD.
OK to commit?
(The next Automake version will allow to specify EXTRA_prog_DEPENDENCIES
that add to, instead of override, automake-computed prog_DEPENDENCIES.)
Thanks,
Ralf
gold: fix testsuite dependencies.
gold/ChangeLog:
2010-12-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* testsuite/Makefile.am (ifuncmain2static_DEPENDENCIES)
(ifuncmain2_DEPENDENCIES, ifuncmain4static_DEPENDENCIES)
(ifuncmain4_DEPENDENCIES, ifuncmain5static_DEPENDENCIES)
(ifuncmain5_DEPENDENCIES, ifuncmain7static_DEPENDENCIES)
(ifuncmain7_DEPENDENCIES): Add $(DEPENDENCIES).
* testsuite/Makefile.in: Regenerate.
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 530b5be..db98d31 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -1619,7 +1619,7 @@ ifuncdep2pic.o: ifuncdep2.c
check_PROGRAMS += ifuncmain2static
ifuncmain2static_SOURCES = ifuncmain2.c ifuncdep2.c
-ifuncmain2static_DEPENDENCIES = gcctestdir/ld
+ifuncmain2static_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
ifuncmain2static_LDFLAGS = -Bgcctestdir/ -static
check_PROGRAMS += ifuncmain2picstatic
@@ -1628,7 +1628,7 @@ ifuncmain2picstatic: ifuncmain2pic.o ifuncdep2pic.o gcctestdir/ld
check_PROGRAMS += ifuncmain2
ifuncmain2_SOURCES = ifuncmain2.c ifuncdep2.c
-ifuncmain2_DEPENDENCIES = gcctestdir/ld
+ifuncmain2_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
ifuncmain2_LDFLAGS = -Bgcctestdir/
check_PROGRAMS += ifuncmain2pic
@@ -1651,7 +1651,7 @@ ifuncmain4pic.o: ifuncmain4.c
check_PROGRAMS += ifuncmain4static
ifuncmain4static_SOURCES = ifuncmain4.c
-ifuncmain4static_DEPENDENCIES = gcctestdir/ld
+ifuncmain4static_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
ifuncmain4static_LDFLAGS = -Bgcctestdir/ -static
check_PROGRAMS += ifuncmain4picstatic
@@ -1660,7 +1660,7 @@ ifuncmain4picstatic: ifuncmain4pic.o gcctestdir/ld
check_PROGRAMS += ifuncmain4
ifuncmain4_SOURCES = ifuncmain4.c
-ifuncmain4_DEPENDENCIES = gcctestdir/ld
+ifuncmain4_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
ifuncmain4_LDFLAGS = -Bgcctestdir/
ifuncmain5pic.o: ifuncmain5.c
@@ -1679,7 +1679,7 @@ ifuncdep5.o: ifuncmod5.c
check_PROGRAMS += ifuncmain5static
ifuncmain5static_SOURCES = ifuncmain5.c
-ifuncmain5static_DEPENDENCIES = gcctestdir/ld ifuncdep5.o
+ifuncmain5static_DEPENDENCIES = gcctestdir/ld ifuncdep5.o $(DEPENDENCIES)
ifuncmain5static_LDFLAGS = -Bgcctestdir/ -static
ifuncmain5static_LDADD = ifuncdep5.o
@@ -1689,7 +1689,7 @@ ifuncmain5picstatic: ifuncmain5pic.o ifuncmod5.o gcctestdir/ld
check_PROGRAMS += ifuncmain5
ifuncmain5_SOURCES = ifuncmain5.c
-ifuncmain5_DEPENDENCIES = gcctestdir/ld ifuncmod5.so
+ifuncmain5_DEPENDENCIES = gcctestdir/ld ifuncmod5.so $(DEPENDENCIES)
ifuncmain5_LDFLAGS = -Bgcctestdir/ -Wl,-R,.
ifuncmain5_LDADD = ifuncmod5.so
@@ -1725,7 +1725,7 @@ ifuncmain7pie.o: ifuncmain7.c
check_PROGRAMS += ifuncmain7static
ifuncmain7static_SOURCES = ifuncmain7.c
-ifuncmain7static_DEPENDENCIES = gcctestdir/ld
+ifuncmain7static_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
ifuncmain7static_LDFLAGS = -Bgcctestdir/ -static
check_PROGRAMS += ifuncmain7picstatic
@@ -1734,7 +1734,7 @@ ifuncmain7picstatic: ifuncmain7pic.o gcctestdir/ld
check_PROGRAMS += ifuncmain7
ifuncmain7_SOURCES = ifuncmain7.c
-ifuncmain7_DEPENDENCIES = gcctestdir/ld
+ifuncmain7_DEPENDENCIES = gcctestdir/ld $(DEPENDENCIES)
ifuncmain7_LDFLAGS = -Bgcctestdir/
check_PROGRAMS += ifuncmain7pic
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: gold: fix testsuite dependencies.
2010-12-15 19:31 gold: fix testsuite dependencies Ralf Wildenhues
@ 2010-12-16 4:25 ` Ian Lance Taylor
2010-12-16 22:03 ` Ralf Wildenhues
0 siblings, 1 reply; 3+ messages in thread
From: Ian Lance Taylor @ 2010-12-16 4:25 UTC (permalink / raw)
To: Ralf Wildenhues; +Cc: binutils
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:
> gold/ChangeLog:
> 2010-12-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
>
> * testsuite/Makefile.am (ifuncmain2static_DEPENDENCIES)
> (ifuncmain2_DEPENDENCIES, ifuncmain4static_DEPENDENCIES)
> (ifuncmain4_DEPENDENCIES, ifuncmain5static_DEPENDENCIES)
> (ifuncmain5_DEPENDENCIES, ifuncmain7static_DEPENDENCIES)
> (ifuncmain7_DEPENDENCIES): Add $(DEPENDENCIES).
> * testsuite/Makefile.in: Regenerate.
This is the wrong way around. All of the tests should have their own
empty _LDADD variable.
That patch is preapproved.
Thanks.
Ian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: gold: fix testsuite dependencies.
2010-12-16 4:25 ` Ian Lance Taylor
@ 2010-12-16 22:03 ` Ralf Wildenhues
0 siblings, 0 replies; 3+ messages in thread
From: Ralf Wildenhues @ 2010-12-16 22:03 UTC (permalink / raw)
To: Ian Lance Taylor; +Cc: binutils
* Ian Lance Taylor wrote on Thu, Dec 16, 2010 at 05:21:16AM CET:
> Ralf Wildenhues writes:
> > * testsuite/Makefile.am (ifuncmain2static_DEPENDENCIES)
> > (ifuncmain2_DEPENDENCIES, ifuncmain4static_DEPENDENCIES)
> > (ifuncmain4_DEPENDENCIES, ifuncmain5static_DEPENDENCIES)
> > (ifuncmain5_DEPENDENCIES, ifuncmain7static_DEPENDENCIES)
> > (ifuncmain7_DEPENDENCIES): Add $(DEPENDENCIES).
> > * testsuite/Makefile.in: Regenerate.
>
> This is the wrong way around. All of the tests should have their own
> empty _LDADD variable.
>
> That patch is preapproved.
Ah, right. Committed like this.
Thanks,
Ralf
gold: fix testsuite dependencies.
gold/ChangeLog:
2010-12-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* testsuite/Makefile.am (ifuncmain2static_LDADD)
(ifuncmain2_LDADD, ifuncmain4static_LDADD, ifuncmain4_LDADD)
(ifuncmain7static_LDADD, ifuncmain7_LDADD): New empty variables,
to avoid unneeded links against $(LDADD).
* testsuite/Makefile.in: Regenerate.
diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 530b5be..b3d969f 100644
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -1621,6 +1621,7 @@ check_PROGRAMS += ifuncmain2static
ifuncmain2static_SOURCES = ifuncmain2.c ifuncdep2.c
ifuncmain2static_DEPENDENCIES = gcctestdir/ld
ifuncmain2static_LDFLAGS = -Bgcctestdir/ -static
+ifuncmain2static_LDADD =
check_PROGRAMS += ifuncmain2picstatic
ifuncmain2picstatic: ifuncmain2pic.o ifuncdep2pic.o gcctestdir/ld
@@ -1630,6 +1631,7 @@ check_PROGRAMS += ifuncmain2
ifuncmain2_SOURCES = ifuncmain2.c ifuncdep2.c
ifuncmain2_DEPENDENCIES = gcctestdir/ld
ifuncmain2_LDFLAGS = -Bgcctestdir/
+ifuncmain2_LDADD =
check_PROGRAMS += ifuncmain2pic
ifuncmain2pic: ifuncmain2pic.o ifuncdep2pic.o gcctestdir/ld
@@ -1653,6 +1655,7 @@ check_PROGRAMS += ifuncmain4static
ifuncmain4static_SOURCES = ifuncmain4.c
ifuncmain4static_DEPENDENCIES = gcctestdir/ld
ifuncmain4static_LDFLAGS = -Bgcctestdir/ -static
+ifuncmain4static_LDADD =
check_PROGRAMS += ifuncmain4picstatic
ifuncmain4picstatic: ifuncmain4pic.o gcctestdir/ld
@@ -1662,6 +1665,7 @@ check_PROGRAMS += ifuncmain4
ifuncmain4_SOURCES = ifuncmain4.c
ifuncmain4_DEPENDENCIES = gcctestdir/ld
ifuncmain4_LDFLAGS = -Bgcctestdir/
+ifuncmain4_LDADD =
ifuncmain5pic.o: ifuncmain5.c
$(COMPILE) -c -fpic -o $@ $<
@@ -1727,6 +1731,7 @@ check_PROGRAMS += ifuncmain7static
ifuncmain7static_SOURCES = ifuncmain7.c
ifuncmain7static_DEPENDENCIES = gcctestdir/ld
ifuncmain7static_LDFLAGS = -Bgcctestdir/ -static
+ifuncmain7static_LDADD =
check_PROGRAMS += ifuncmain7picstatic
ifuncmain7picstatic: ifuncmain7pic.o gcctestdir/ld
@@ -1736,6 +1741,7 @@ check_PROGRAMS += ifuncmain7
ifuncmain7_SOURCES = ifuncmain7.c
ifuncmain7_DEPENDENCIES = gcctestdir/ld
ifuncmain7_LDFLAGS = -Bgcctestdir/
+ifuncmain7_LDADD =
check_PROGRAMS += ifuncmain7pic
ifuncmain7pic: ifuncmain7pic.o gcctestdir/ld
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-16 18:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-15 19:31 gold: fix testsuite dependencies Ralf Wildenhues
2010-12-16 4:25 ` Ian Lance Taylor
2010-12-16 22:03 ` Ralf Wildenhues
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).