Makefile.in (stamp-collect-ld): Use $(ORIGINAL_LD_FOR_TARGET) instead of $<.

	* Makefile.in (stamp-collect-ld): Use
	$(ORIGINAL_LD_FOR_TARGET) instead of $<.  Don't remove
	./collect-ld if it already exists.
	(stamp-nm): Use $(ORIGINAL_NM_FOR_TARGET) instead of $<.
	Don't remove ./nm if it already exists.

From-SVN: r101651

gcc/ChangeLog

+2005-07-06  Kazu Hirata  <kazu@codesourcery.com>
+
+	* Makefile.in (stamp-collect-ld): Use
+	$(ORIGINAL_LD_FOR_TARGET) instead of $<.  Don't remove
+	./collect-ld if it already exists.
+	(stamp-nm): Use $(ORIGINAL_NM_FOR_TARGET) instead of $<.
+	Don't remove ./nm if it already exists.
+
 2005-07-05  Devang Patel  <dpatel@apple.com>
 
 	* tree-vectorizer.h (struct _loop_vec_info): Remove loop_line_number.

gcc/Makefile.in

@@ -1222,25 +1222,33 @@ stamp-as: $(ORIGINAL_AS_FOR_TARGET)
 	echo timestamp > $@
 
 stamp-collect-ld: $(ORIGINAL_LD_FOR_TARGET)
-	@echo creating collect-ld; rm -f collect-ld; \
-	case "$<" in \
-	  ./*) ;; \
+	@echo creating collect-ld; \
+	case "$(ORIGINAL_LD_FOR_TARGET)" in \
+	  ./collect-ld) ;; \
 	  ../*) \
+	     rm -f collect-ld$(exeext); \
 	     echo $(LN) $< collect-ld$(exeext); \
 	     $(LN) $< collect-ld$(exeext) || cp $< collect-ld$(exeext) ;; \
-	  *) echo '#!$(SHELL)' > collect-ld; echo 'exec $< "$$@"' >> collect-ld ; \
+	  *) \
+	     rm -f collect-ld$(exeext); \
+	     echo '#!$(SHELL)' > collect-ld; \
+	     echo 'exec $(ORIGINAL_LD_FOR_TARGET) "$$@"' >> collect-ld ; \
 	     chmod +x collect-ld ;; \
 	esac
 	echo timestamp > $@
 
 stamp-nm: $(ORIGINAL_NM_FOR_TARGET)
-	@echo creating nm; rm -f nm; \
-	case "$<" in \
-	  ./*) ;; \
+	@echo creating nm; \
+	case "$(ORIGINAL_NM_FOR_TARGET)" in \
+	  ./nm) ;; \
 	  ../*) \
+	     rm -f nm$(exeext); \
 	     echo $(LN) $< nm$(exeext); \
 	     $(LN) $< nm$(exeext) || cp $< nm$(exeext) ;; \
-	  *) echo '#!$(SHELL)' > nm; echo 'exec $< "$$@"' >> nm ; \
+	  *) \
+	     rm -f nm$(exeext); \
+	     echo '#!$(SHELL)' > nm; \
+	     echo 'exec $(ORIGINAL_NM_FOR_TARGET) "$$@"' >> nm ; \
 	     chmod +x nm ;; \
 	esac
 	echo timestamp > $@