diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e3c9fdb259b87d6b8121d369573be3f423fc072b..d418de5f577b214b9af5c4c2ebf5d64798b2a175 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
+
+        * Makefile.in (gnatlib): Fix regex, using \. instead of . when
+	a period is meant.
+
 2005-12-02  Richard Guenther  <rguenther@suse.de>
 
 	* trans.c (gnat_gimplify_expr): Use buildN instead of build.
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in
index 2d7224056feb483e8c692ba61dcea0210f977f60..b6886a981346ea67fde42c01d076ba6e8f904e6d 100644
--- a/gcc/ada/Makefile.in
+++ b/gcc/ada/Makefile.in
@@ -1591,14 +1591,14 @@ GCC_FOR_TARGET=./xgcc -B./ $(FLAGS_FOR_TARGET)
 gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
 	$(MAKE) -C rts \
 		CC="`echo \"$(GCC_FOR_TARGET)\" \
-		| sed -e 's^./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`" \
+		| sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
 	        INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
                 CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
 		srcdir=$(fsrcdir) \
 	        -f ../Makefile $(LIBGNAT_OBJS)
 	$(MAKE) -C rts \
 		CC="`echo \"$(GCC_FOR_TARGET)\" \
-		| sed -e 's^\./xgcc^../../xgcc^' -e 's^-B./^-B../../^'`" \
+		| sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
 	        ADA_INCLUDES="" \
                 CFLAGS="$(GNATLIBCFLAGS)" \
 	        ADAFLAGS="$(GNATLIBFLAGS)" \
diff --git a/libada/ChangeLog b/libada/ChangeLog
index 2e8bfc2cd53c0ad56e2c9d3abc7f2a19bcb1f3e4..127178d79679dbc0297d69d7b6147471b09076e4 100644
--- a/libada/ChangeLog
+++ b/libada/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-05  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.in (FLAGS_TO_PASS): Add GCC_FOR_TARGET.
+
 2005-04-27  James E Wilson  <wilson@specifixinc.com>
 
 	* Makefile.in (html): New.
diff --git a/libada/Makefile.in b/libada/Makefile.in
index 3e0db0befe1c473f381fe8afae90ea7e863b3789..e975dd393c60d2b020b91cbdfeabe07c1ecf775e 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -75,6 +75,7 @@ FLAGS_TO_PASS = \
         "prefix=$(prefix)" \
         "STAGE_PREFIX=$(STAGE_PREFIX)" \
 	"CC=$(host_cc_for_libada)" \
+	"GCC_FOR_TARGET=$(CC)" \
         "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)"
 
 # Rules to build gnatlib.