From 90e24de5daa814b422dbd990ba6db5557774c2cb Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 29 Oct 2010 15:45:40 +0000 Subject: * testsuite/Makefile.am: Move gcctestdir/ld rule to NATIVE_OR_CROSS_LINKER. * testsuite/Makefile.in: Regenerate. --- gold/ChangeLog | 6 ++++++ gold/testsuite/Makefile.am | 18 +++++++++++------- gold/testsuite/Makefile.in | 18 +++++++++--------- 3 files changed, 26 insertions(+), 16 deletions(-) (limited to 'gold') diff --git a/gold/ChangeLog b/gold/ChangeLog index 9560dab..e187759 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2010-10-29 Viktor Kutuzov + + * testsuite/Makefile.am: Move gcctestdir/ld rule to + NATIVE_OR_CROSS_LINKER. + * testsuite/Makefile.in: Regenerate. + 2010-10-20 Doug Kwan * arm.cc (Arm_relobj::do_read_symbols): Warn about ARM EXIDX sections diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index fb4d4e3..530b5be 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -71,6 +71,17 @@ LDADD = libgoldtest.a ../libgold.a ../../libiberty/libiberty.a $(LIBINTL) \ # The unittests themselves if NATIVE_OR_CROSS_LINKER +if GCC + +# Infrastucture needed for the unittests: a directory where the linker +# is named 'ld'. This is because the -B flag appends 'ld' to its arg. +gcctestdir/ld: ../ld-new + test -d gcctestdir || mkdir -p gcctestdir + rm -f gcctestdir/ld + (cd gcctestdir && $(LN_S) ../../ld-new ld) + +endif GCC + check_PROGRAMS += object_unittest object_unittest_SOURCES = object_unittest.cc @@ -91,13 +102,6 @@ endif NATIVE_OR_CROSS_LINKER if NATIVE_LINKER if GCC -# Infrastucture needed for the unittests: a directory where the linker -# is named 'ld'. This is because the -B flag appends 'ld' to its arg. -gcctestdir/ld: ../ld-new - test -d gcctestdir || mkdir -p gcctestdir - rm -f gcctestdir/ld - (cd gcctestdir && $(LN_S) ../../ld-new ld) - # Each of these .o's is a useful, small complete program. They're # particularly useful for making sure ld-new's flags do what they're # supposed to (hence their names), but are used for many tests that diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index fe62867..44f3826 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -48,8 +48,6 @@ check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \ $(am__EXEEXT_16) $(am__EXEEXT_17) $(am__EXEEXT_18) \ $(am__EXEEXT_19) $(am__EXEEXT_20) $(am__EXEEXT_21) \ $(am__EXEEXT_22) - -# The unittests themselves @NATIVE_OR_CROSS_LINKER_TRUE@am__append_1 = object_unittest \ @NATIVE_OR_CROSS_LINKER_TRUE@ binary_unittest @@ -3760,6 +3758,15 @@ uninstall-am: recheck recheck-html tags uninstall uninstall-am +# The unittests themselves + +# Infrastucture needed for the unittests: a directory where the linker +# is named 'ld'. This is because the -B flag appends 'ld' to its arg. +@GCC_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@gcctestdir/ld: ../ld-new +@GCC_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ test -d gcctestdir || mkdir -p gcctestdir +@GCC_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ rm -f gcctestdir/ld +@GCC_TRUE@@NATIVE_OR_CROSS_LINKER_TRUE@ (cd gcctestdir && $(LN_S) ../../ld-new ld) + # --------------------------------------------------------------------- # These tests test the output of gold (end-to-end tests). In # particular, they make sure that gold can link "difficult" object @@ -3769,13 +3776,6 @@ uninstall-am: # tests. We use the gcc-specific flag '-B' to use our linker instead # of the default linker, which is why we only run our tests under gcc. -# Infrastucture needed for the unittests: a directory where the linker -# is named 'ld'. This is because the -B flag appends 'ld' to its arg. -@GCC_TRUE@@NATIVE_LINKER_TRUE@gcctestdir/ld: ../ld-new -@GCC_TRUE@@NATIVE_LINKER_TRUE@ test -d gcctestdir || mkdir -p gcctestdir -@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f gcctestdir/ld -@GCC_TRUE@@NATIVE_LINKER_TRUE@ (cd gcctestdir && $(LN_S) ../../ld-new ld) - # Each of these .o's is a useful, small complete program. They're # particularly useful for making sure ld-new's flags do what they're # supposed to (hence their names), but are used for many tests that -- cgit v1.1