From 6f371a2e412f0384dcdc36ebd00c8597be74a098 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Wed, 6 Aug 2008 13:55:07 +0000
Subject: [PATCH] Make-lang.in: Use GCC_FOR_TARGET when dealing with
 s-oscons-tmplt.i.

    gcc/ada/
	* gcc-interface/Make-lang.in: Use GCC_FOR_TARGET when dealing
	with s-oscons-tmplt.i.

    libada/
	* Makefile.in: Pass FLAGS_TO_PASS to sub-make for target
	oscons.

From-SVN: r138800
---
 gcc/ada/ChangeLog                  | 5 +++++
 gcc/ada/gcc-interface/Make-lang.in | 4 ++--
 libada/ChangeLog                   | 5 +++++
 libada/Makefile.in                 | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 5d4f516e771..be092505283 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Samuel Tardieu  <sam@rfc1149.net>
+
+	* gcc-interface/Make-lang.in: Use GCC_FOR_TARGET when dealing
+	with s-oscons-tmplt.i.
+
 2008-08-06  Samuel Tardieu  <sam@rfc1149.net>
 
 	* gcc-interface/Make-lang.in (OSCONS_CPPFLAGS): Remove.
diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index 9233f1e71ea..9af841d2915 100644
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -933,9 +933,9 @@ OSCONS_EXTRACT=../../../$(DECC) -DNATIVE \
   ./s-oscons-tmplt.exe > s-oscons-tmplt.s
 
 else
-OSCONS_CPP=../../../xgcc -B../../../ -E -C \
+OSCONS_CPP=$(GCC_FOR_TARGET) -E -C \
   -DTARGET=\"$(target)\" s-oscons-tmplt.c > s-oscons-tmplt.i
-OSCONS_EXTRACT=../../../xgcc -S -B../../../ s-oscons-tmplt.i
+OSCONS_EXTRACT=$(GCC_FOR_TARGET) -S s-oscons-tmplt.i
 endif
 
 ada/s-oscons-$(THREAD_KIND).ads : ada/s-oscons-tmplt.c ada/gsocket.h ada/xoscons.adb ada/xutil.ads ada/xutil.adb
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 89eb1dbeb89..e56394e0a40 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-06  Samuel Tardieu  <sam@rfc1149.net>
+
+	* Makefile.in: Pass FLAGS_TO_PASS to sub-make for target
+	oscons.
+
 2008-08-06  Thomas Quinot  <quinot@adacore.com>
 
 	* Makefile.in: Now generate s-oscons-$(THREAD_KIND).
diff --git a/libada/Makefile.in b/libada/Makefile.in
index e8ca515f82b..211e3eb50f1 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -94,7 +94,9 @@ gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
 	&& touch stamp-libada
 
 oscons:
-	$(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" ada/s-oscons-$(THREAD_KIND).ads
+	$(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" \
+	  $(FLAGS_TO_PASS) \
+	  ada/s-oscons-$(THREAD_KIND).ads
 
 # Check uninstalled version.
 check: