X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=gcc%2Fmkconfig.sh;h=e93d45fabb3bba656cf309348cafb4d69f519bca;hb=bad70983c0a3b030db33a636db619c0606b39f51;hp=b63e40a7087435feb727fa72ec8d324b22b985a0;hpb=f9c310767f8d0464ab1359326f08254f3dea9440;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
index b63e40a7087..e93d45fabb3 100644
--- a/gcc/mkconfig.sh
+++ b/gcc/mkconfig.sh
@@ -1,107 +1,121 @@
 #! /bin/sh
 
-# Generate gcc's config.h, which is not your normal autoconf-generated
-# config.h (that's auto-(host|build).h).  $1 is the file to generate.
-# HEADERS, DEFINES, and possibly TARGET_CPU_DEFAULT are expected to be
-# set in the environment.
+# Copyright (C) 2001, 2002, 2006, 2007, 2010, 2011
+# Free Software Foundation, Inc.
+# This file is part of GCC.
+
+# GCC is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+
+# GCC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.  
+
+
+# Generate gcc's various configuration headers:
+# config.h, tconfig.h, bconfig.h, tm.h, libgcc_tm.h, and tm_p.h.
+# $1 is the file to generate.  DEFINES, HEADERS, and possibly
+# TARGET_CPU_DEFAULT are expected to be set in the environment.
 
 if [ -z "$1" ]; then
-    echo "Usage: HEADERS='list' DEFINES='list' mkconfig.sh FILE" >&2
+    echo "Usage: DEFINES='list' HEADERS='list' \\" >&2
+    echo "  [TARGET_CPU_DEFAULT='default'] mkconfig.sh FILE" >&2
     exit 1
 fi
 
 output=$1
-rm -f $output.T
+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}`
 
-# We used to exec > $output.T but apparently this has bugs.
-# Use a redirected subshell instead.
-(
+# 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
-    echo "#define TARGET_CPU_DEFAULT ($TARGET_CPU_DEFAULT)"
+    echo "#define TARGET_CPU_DEFAULT ($TARGET_CPU_DEFAULT)" >> ${output}T
 fi
 
-# The first entry in HEADERS may be auto-host.h or auto-build.h;
+# Provide defines for other macros set in config.gcc for this file.
+for def in $DEFINES; do
+    echo "#ifndef $def" | sed 's/=.*//' >> ${output}T
+    echo "# define $def" | sed 's/=/ /' >> ${output}T
+    echo "#endif" >> ${output}T
+done
+
+# The first entry in HEADERS may be auto-FOO.h ;
 # it wants to be included even when not -DIN_GCC.
+# Postpone including defaults.h until after the insn-*
+# headers, so that the HAVE_* flags are available
+# when defaults.h gets included.
+postpone_defaults_h="no"
 if [ -n "$HEADERS" ]; then
-    set $HEADERS; first=$1
-    case $first in auto-* )
-	echo "#include \"$first\""
+    set $HEADERS
+    case "$1" in auto-* )
+	echo "#include \"$1\"" >> ${output}T
 	shift
-	HEADERS=$*
 	;;
     esac
+    if [ $# -ge 1 ]; then
+	echo '#ifdef IN_GCC' >> ${output}T
+	for file in "$@"; do
+	    if test x"$file" = x"defaults.h"; then
+		postpone_defaults_h="yes"
+	    else
+		echo "# include \"$file\"" >> ${output}T
+	    fi
+	done
+	echo '#endif' >> ${output}T
+    fi
 fi
 
-# Provide three core typedefs used by everything, if we are compiling
-# GCC.  These used to be found in rtl.h and tree.h, but this is no
-# longer practical. Providing these in config.h/tconfig.h/hconfig.h
-# rather than system.h allows the typedefs to be used anywhere in GCC.
-case $output in 
-    *config.h | *hconfig.h | *tconfig.h)
-        echo "#ifdef IN_GCC"
-        echo "/* Provide three core typedefs used by everything, if we are compiling"
-        echo "   GCC.  These used to be found in rtl.h and tree.h, but this is no"
-        echo "   longer practical.  Providing these here rather that system.h allows"
-        echo "   the typedefs to be used everywhere within GCC. */"
-        echo "struct rtx_def;"
-        echo "typedef struct rtx_def *rtx;"
-        echo "struct rtvec_def;"
-        echo "typedef struct rtvec_def *rtvec;"
-        echo "union tree_node;"
-        echo "typedef union tree_node *tree;"
-        echo "#endif"
-        ;;
-esac
-
-if [ -n "$HEADERS" ]; then
-    echo '#ifdef IN_GCC'
-    for file in $HEADERS; do
-	echo "# include \"$file\""
-    done
-    echo '#endif'
-fi
-
-for def in $DEFINES; do
-    echo "#ifndef $def" | sed 's/=.*//'
-    echo "# define $def" | sed 's/=/ /'
-    echo "#endif"
-done
+# If this is tm.h, now include 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_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"
+    tm.h )
+        cat >> ${output}T <<EOF
+#if defined IN_GCC && !defined GENERATOR_FILE && !defined USED_FOR_TARGET
+# include "insn-flags.h"
+#endif
+EOF
     ;;
 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'
+# If we postponed including defaults.h, add the #include now.
+if test x"$postpone_defaults_h" = x"yes"; then
+    echo "# include \"defaults.h\"" >> ${output}T
+fi
 
-) > $output.T
+# 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
+if [ -f $output ] && cmp ${output}T $output >/dev/null 2>&1; then
     echo $output is unchanged >&2
-    rm -f $output.T
+    rm -f ${output}T
 else
-    mv -f $output.T $output
+    mv -f ${output}T $output
 fi
 
 # Touch a stamp file for Make's benefit.