From 82dc43090930a3826bd3a83132560c9ad2d735bf Mon Sep 17 00:00:00 2001
From: drow <drow@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 19 Apr 2005 19:53:26 +0000
Subject: [PATCH] 	* Makefile.in (libgcc.mk): Pass GCC_FOR_TARGET. 
 * mklibgcc.in: Use $GCC_FOR_TARGET instead of ./xgcc.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98420 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog   | 5 +++++
 gcc/Makefile.in | 1 +
 gcc/mklibgcc.in | 5 +++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 99347ef..1e6eca8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* Makefile.in (libgcc.mk): Pass GCC_FOR_TARGET.
+	* mklibgcc.in: Use $GCC_FOR_TARGET instead of ./xgcc.
+
 2005-04-19  Paul Brook  <paul@codesourcery.com>
 
 	* config/arm/arm.c (arm_init_libfuncs): Clear mod optabs. 
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index b720a37..5e2e9c6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1262,6 +1262,7 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) $(LIB2ADD_ST) xgcc$(exeext
 	SHLIB_NM_FLAGS='$(SHLIB_NM_FLAGS)' \
 	MULTILIB_OSDIRNAMES='$(MULTILIB_OSDIRNAMES)' \
 	ASM_HIDDEN_OP='$(ASM_HIDDEN_OP)' \
+	GCC_FOR_TARGET='$(GCC_FOR_TARGET)' \
 	mkinstalldirs='$(mkinstalldirs)' \
 	  $(SHELL) mklibgcc > tmp-libgcc.mk
 	mv tmp-libgcc.mk libgcc.mk
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index d4df66a..aa61d41 100644
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -40,6 +40,7 @@
 # SHLIB_INSTALL
 # MULTILIB_OSDIRNAMES
 # ASM_HIDDEN_OP
+# GCC_FOR_TARGET
 
 # Make needs VPATH to be literal.
 echo 'srcdir = @srcdir@'
@@ -178,7 +179,7 @@ for ml in $MULTILIBS; do
     if [ "$LIBUNWIND" ]; then
       libunwind_so=$dir/libunwind${SHLIB_EXT}
     fi
-    os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory`
+    os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
     if [ "$os_multilib_dir" != . ]; then
       shlib_slibdir_qual="/$os_multilib_dir"
     fi
@@ -804,7 +805,7 @@ for ml in $MULTILIBS; do
     echo '	$(RANLIB_FOR_TARGET)' ${ldir}/libgcc_eh.a
 
     shlib_slibdir_qual=
-    os_multilib_dir=`./xgcc -B./ $flags --print-multi-os-directory`
+    os_multilib_dir=`$GCC_FOR_TARGET $flags --print-multi-os-directory`
     if [ "$os_multilib_dir" != . ]; then
       shlib_slibdir_qual="/$os_multilib_dir"
     fi
-- 
2.7.4