diff --git a/ChangeLog b/ChangeLog
index cb17edc226ca584b853b9acd7330c96a6167083c..ab20b13687b0187328681560f8bbdebdbb66c6d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-19  Paolo Bonzini  <bonzini@gnu.org>
+
+	* configure.in: Remove "$build" case for powerpc-*-darwin* since
+	it only affects bootstrap and could be tested on "$host" as well.
+	* configure: Regenerate.
+	* config/mh-ppc-darwin: Add to the stage1 cflags here.
+
 2006-12-19  Paolo Bonzini  <bonzini@gnu.org>
 
 	PR bootstrap/29544
diff --git a/config/mh-ppc-darwin b/config/mh-ppc-darwin
index 44fd620b66e2a4e459debbe077368b9915b2f52b..231415e5401d3f52ad8fa9edeba72982f136be10 100644
--- a/config/mh-ppc-darwin
+++ b/config/mh-ppc-darwin
@@ -4,3 +4,8 @@
 
 BOOT_CFLAGS=-g -O2 -mdynamic-no-pic
 
+# The spiffy cpp-precomp chokes on some legitimate constructs in GCC
+# sources; use -no-cpp-precomp to get to GNU cpp.
+# Apple's GCC has bugs in designated initializer handling, so disable
+# that too.
+STAGE1_CFLAGS += -no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0
diff --git a/configure b/configure
index 37850ced64fafce8575a86765e356564c3dca9ed..3f69c1d050b676bfd6e2c88c7099baac7358bd81 100755
--- a/configure
+++ b/configure
@@ -7299,13 +7299,6 @@ case $build in
       yes) stage1_cflags="-g -Wa,-J" ;;
       *) stage1_cflags="-g -J" ;;
     esac ;;
-  powerpc-*-darwin*)
-    # The spiffy cpp-precomp chokes on some legitimate constructs in GCC
-    # sources; use -no-cpp-precomp to get to GNU cpp.
-    # Apple's GCC has bugs in designated initializer handling, so disable
-    # that too.
-    stage1_cflags="-g -no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
-    ;;
 esac
 
 # This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.
@@ -7315,16 +7308,16 @@ if test "$GCC" = yes; then
   # Pass -fkeep-inline-functions for stage 1 if the GCC version supports it.
   CFLAGS="$CFLAGS -fkeep-inline-functions"
   echo $ac_n "checking whether -fkeep-inline-functions is supported""... $ac_c" 1>&6
-echo "configure:7319: checking whether -fkeep-inline-functions is supported" >&5
+echo "configure:7312: checking whether -fkeep-inline-functions is supported" >&5
   cat > conftest.$ac_ext <<EOF
-#line 7321 "configure"
+#line 7314 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; stage1_cflags="$stage1_cflags -fkeep-inline-functions"
 else
diff --git a/configure.in b/configure.in
index 9400c51dc8e9014b469103aa224487b974c79ad9..fb1ef6d92a25d94b6de64e40e2df734ed251ad4d 100644
--- a/configure.in
+++ b/configure.in
@@ -2403,13 +2403,6 @@ case $build in
       yes) stage1_cflags="-g -Wa,-J" ;;
       *) stage1_cflags="-g -J" ;;
     esac ;;
-  powerpc-*-darwin*)
-    # The spiffy cpp-precomp chokes on some legitimate constructs in GCC
-    # sources; use -no-cpp-precomp to get to GNU cpp.
-    # Apple's GCC has bugs in designated initializer handling, so disable
-    # that too.
-    stage1_cflags="-g -no-cpp-precomp -DHAVE_DESIGNATED_INITIALIZERS=0"
-    ;;
 esac
 
 # This is aimed to mimic bootstrap with a non-GCC compiler to catch problems.