From mboxrd@z Thu Jan  1 00:00:00 1970
From: "H . J . Lu" <hjl@lucon.org>
To: binutils@sourceware.cygnus.com
Subject: PATCH: Fix ld bootstrap test for ia64
Date: Sat, 29 Sep 2001 21:25:00 -0000
Message-id: <20010929212158.B7417@lucon.org>
X-SW-Source: 2001-09/msg00517.html

It has been a while for me to check binutils on ia64. It looks like
we have to always rebuild tmpdir/ld2 with tmpdir/ld3 on ia64 like
Linux/mips. Could someone please verify it on ia64?


H.J.
----
2001-09-29  H.J. Lu  <hjl@gnu.org>

	* ld-bootstrap/bootstrap.exp: Always rebuild tmpdir/ld2 with
	tmpdir/ld3 on ia64.

Index: ld-bootstrap/bootstrap.exp
===================================================================
RCS file: /work/cvs/gnu/binutils/ld/testsuite/ld-bootstrap/bootstrap.exp,v
retrieving revision 1.5
diff -u -p -r1.5 bootstrap.exp
--- ld-bootstrap/bootstrap.exp	2001/06/06 22:10:34	1.5
+++ ld-bootstrap/bootstrap.exp	2001/09/30 04:17:20
@@ -104,26 +104,15 @@ foreach flags {"" "strip" "--static" "--
 	continue
     }
 
-    if {"$flags" == "--static"} {
-	if { [istarget ia64-*-elf*]
-	     || [istarget ia64-*-linux*] } {
-	    # On ia64, tmpdir/ld2 != tmpdir/ld3 is normal since they are
-	    # generated by different linkers, tmpdir/ld1 and tmpdir/ld2.
-	    # So we rebuild tmpdir/ld2 with tmpdir/ld3.
-	    if ![ld_link tmpdir/ld3 tmpdir/ld2 "$flags $OFILES $BFDLIB $LIBIBERTY"] {
-		fail $testname
-		continue
-	    }
-	}
-    } else {
-	if { [istarget mips*-*-linux*] } {
-	    # On Linux/mips, tmpdir/ld2 != tmpdir/ld3 is normal since
-	    # they are generated by different linkers, tmpdir/ld1 and
-	    # tmpdir/ld2. So we rebuild tmpdir/ld2 with tmpdir/ld3.
-	    if ![ld_link tmpdir/ld3 tmpdir/ld2 "$flags $OFILES $BFDLIB $LIBIBERTY"] {
-		fail $testname
-		continue
-	    }
+    if { [istarget ia64-*-elf*]
+	 || [istarget ia64-*-linux*]
+	 || [istarget mips*-*-linux*] } {
+	# On ia64 and Linux/mips, tmpdir/ld2 != tmpdir/ld3 is normal
+	# since they are generated by different linkers, tmpdir/ld1
+	# and tmpdir/ld2. So we rebuild tmpdir/ld2 with tmpdir/ld3.
+	if ![ld_link tmpdir/ld3 tmpdir/ld2 "$flags $OFILES $BFDLIB $LIBIBERTY"] {
+	    fail $testname
+	    continue
 	}
     }