diff --git a/gcc/configure b/gcc/configure
index 532750efec8..e3b38f64dd6 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -5111,6 +5111,19 @@ case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > cstamp-h ;;
 esac
+# Make sure we create things so -Bstage1/ will work.
+for d in .. ${subdirs} ; do
+  if [ $d != .. ]; then
+	STARTDIR=`pwd`
+	cd $d
+	for t in stage1 stage2 stage3 stage4 include
+	do
+		rm -f $t
+		$symbolic_link ../$t $t 2>/dev/null
+	done
+	cd $STARTDIR
+  fi
+done
 
 exit 0
 EOF
diff --git a/gcc/configure.in b/gcc/configure.in
index 605cb6014bf..4d991f93df6 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3147,6 +3147,19 @@ case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > cstamp-h ;;
 esac
+# Make sure we create things so -Bstage1/ will work.
+for d in .. ${subdirs} ; do
+  if [ $d != .. ]; then
+	STARTDIR=`pwd`
+	cd $d
+	for t in stage1 stage2 stage3 stage4 include
+	do
+		rm -f $t
+		$symbolic_link ../$t $t 2>/dev/null
+	done
+	cd $STARTDIR
+  fi
+done
 ],
 [
 host='${host}'