* builtins.c, cfgloop.h, cgraph.h, config/arm/arm.c,

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

diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
index 64d118f..d47667d 100644 (file)
--- a/gcc/mkconfig.sh
+++ b/gcc/mkconfig.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
 # This file is part of GCC.
 
 # GCC is free software; you can redistribute it and/or modify
@@ -15,8 +15,8 @@
 
 # You should have received a copy of the GNU General Public License
 # along with GCC; see the file COPYING.  If not, write to
-# the Free Software Foundation, 59 Temple Place - Suite 330,
-# Boston MA 02111-1307, USA.
+# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+# Boston MA 02110-1301, USA.
 
 
 # Generate gcc's various configuration headers:
@@ -33,6 +33,22 @@ fi
 output=$1
 rm -f ${output}T
 
+# This converts a file name into header guard macro format.
+hg_sed_expr='y,abcdefghijklmnopqrstuvwxyz./,ABCDEFGHIJKLMNOPQRSTUVWXYZ__,'
+header_guard=GCC_`echo ${output} | sed -e ${hg_sed_expr}`
+
+# Add multiple inclusion protection guard, part one.
+echo "#ifndef ${header_guard}" >> ${output}T
+echo "#define ${header_guard}" >> ${output}T
+
+# A special test to ensure that build-time files don't blindly use
+# config.h.
+if test x"$output" = x"config.h"; then
+  echo "#ifdef GENERATOR_FILE" >> ${output}T
+  echo "#error config.h is for the host, not build, machine." >> ${output}T
+  echo "#endif" >> ${output}T
+fi
+
 # Define TARGET_CPU_DEFAULT if the system wants one.
 # This substitutes for lots of *.h files.
 if [ "$TARGET_CPU_DEFAULT" != "" ]; then
@@ -46,7 +62,7 @@ for def in $DEFINES; do
     echo "#endif" >> ${output}T
 done
 
-# The first entry in HEADERS may be auto-host.h or auto-build.h;
+# The first entry in HEADERS may be auto-FOO.h ;
 # it wants to be included even when not -DIN_GCC.
 if [ -n "$HEADERS" ]; then
     set $HEADERS
@@ -64,17 +80,11 @@ if [ -n "$HEADERS" ]; then
     fi
 fi
 
-# If this is tconfig.h, now define USED_FOR_TARGET.  If this is tm.h,
-# now include insn-constants.h and insn-flags.h only if IN_GCC is
-# defined but neither GENERATOR_FILE nor USED_FOR_TARGET is defined.
-# (Much of this is temporary.)
+# If this is tm.h, now include insn-constants.h and insn-flags.h only
+# if IN_GCC is defined but neither GENERATOR_FILE nor USED_FOR_TARGET
+# is defined.  (Much of this is temporary.)
 
 case $output in
-    tconfig.h )
-       cat >> ${output}T <<EOF
-#define USED_FOR_TARGET
-EOF
-    ;;
     tm.h )
         cat >> ${output}T <<EOF
 #if defined IN_GCC && !defined GENERATOR_FILE && !defined USED_FOR_TARGET
@@ -85,6 +95,9 @@ EOF
     ;;
 esac
 
+# Add multiple inclusion protection guard, part two.
+echo "#endif /* ${header_guard} */" >> ${output}T
+
 # Avoid changing the actual file if possible.
 if [ -f $output ] && cmp ${output}T $output >/dev/null 2>&1; then
     echo $output is unchanged >&2