diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d9784a8838930a1b4aa383aa199aec6b88ea2f9..1a923a0631befe0b3fbe40840e66da67e7cbf674 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-17  Jason Merrill  <jason@redhat.com>
+
+	* genmultilib: Use 'cd ./foo'.
+
 2002-12-17  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* doc/c-tree.texi: Restore deliberate spelling mistakes.
@@ -36,6 +40,9 @@ Tue Dec 17 09:47:57 CET 2002  Jan Hubicka  <jh@suse.cz>
 
 2002-12-16  Jason Merrill  <jason@redhat.com>
 
+	* calls.c (expand_call): Handle CALL_EXPR_HAS_RETURN_SLOT_ADDR
+	with special struct-return ABIs.
+
 	* c-semantics.c (add_scope_stmt): Abort if the end SCOPE_STMT
 	doesn't match the begin SCOPE_STMT in partialness.
 
diff --git a/gcc/genmultilib b/gcc/genmultilib
index 7b5cdc2ff6d26f9365ad0f95a8ab7b0b46ab5220..097ecf95dee62e49e9cad49b21f61db946887864 100644
--- a/gcc/genmultilib
+++ b/gcc/genmultilib
@@ -121,7 +121,8 @@ enable_multilib=$8
 echo "static const char *const multilib_raw[] = {"
 
 mkdir tmpmultilib.$$ || exit 1
-cd tmpmultilib.$$ || exit 1
+# Use cd ./foo to avoid CDPATH output.
+cd ./tmpmultilib.$$ || exit 1
 
 # What we want to do is select all combinations of the sets in
 # options.  Each combination which includes a set of mutually