* ChangeLog, docs/doxygen/maint.cfg.in, docs/doxygen/user.cfg.in,

[pf3gnuchains/gcc-fork.git] / gcc / mkconfig.sh

diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
index 5250708..fde254a 100644 (file)
--- a/gcc/mkconfig.sh
+++ b/gcc/mkconfig.sh
@@ -44,17 +44,34 @@ if [ -n "$HEADERS" ]; then
 fi
 
 for def in $DEFINES; do
-    echo "#ifndef $def"
-    echo "# define $def"
+    echo "#ifndef $def" | sed 's/=.*//'
+    echo "# define $def" | sed 's/=/ /'
     echo "#endif"
 done
 
-# Include insn-codes.h last, because it includes machmode.h,
-# and we want EXTRA_CC_MODES to be taken into account.
-echo "#ifndef GENERATOR_FILE"
-echo "#include \"insn-codes.h\""
-echo "#include \"insn-flags.h\""
-echo "#endif"
+# If this is tm_p.h, include tm-preds.h unconditionally.
+# If this is tconfig.h or hconfig.h, include no more files.
+# Otherwise, include insn-constants.h and insn-flags.h,
+# but only if GENERATOR_FILE is not defined.
+case $output in
+    *tm_p.h)
+       echo "#include \"tm-preds.h\""
+    ;;
+    *tconfig.h | *hconfig.h)
+    ;;
+    *)
+       echo "#ifndef GENERATOR_FILE"
+       echo "# include \"insn-constants.h\""
+       echo "# include \"insn-flags.h\""
+       echo "#endif"
+    ;;
+esac
+
+# Prevent obstack.c from thinking it can do i18n of its error message
+# when it's being linked against a build-side program.
+echo '#ifdef GENERATOR_FILE'
+echo '# undef ENABLE_NLS'
+echo '#endif'
 
 ) > $output.T