* testsuite/Makefile.am: Move gcctestdir/ld rule to

        NATIVE_OR_CROSS_LINKER.
	* testsuite/Makefile.in: Regenerate.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 9560dab84885ebdf900a9965ab5de4121130d1b8..e18775973d950dda7ee52979836852358e57c84e 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-29  Viktor Kutuzov  <vkutuzov@accesssoftek.com>
+
+       * testsuite/Makefile.am: Move gcctestdir/ld rule to
+        NATIVE_OR_CROSS_LINKER.
+       * testsuite/Makefile.in: Regenerate.
+
 2010-10-20  Doug Kwan  <dougkwan@google.com>
 
        * 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 fb4d4e3147bdc910acd03a0e03f8b6c2489e1c01..530b5bea1ae55765bf34f4da551229a9857d533b 100644 (file)
--- 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 fe62867e5b459a45e82816647ac2a586035df889..44f38265a8fb9c5c54413a27d445a2432f263f7d 100644 (file)
--- 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