* decl.c (init_decl_processing): Remove duplicate decl of

[pf3gnuchains/gcc-fork.git] / gcc / configure.in

diff --git a/gcc/configure.in b/gcc/configure.in
index 71ff2ab..2bd136e 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -218,11 +218,11 @@ elif test x$withval != xno; then
 fi])
 
 # Use cpplib+cppmain for the preprocessor, but don't link it with the compiler.
-cpp_main=cccp
+cpp_main=cppmain
 AC_ARG_ENABLE(cpplib,
-[  --enable-cpplib         use cpplib for the C preprocessor.],
-if test x$enable_cpplib != xno; then
-  cpp_main=cppmain
+[  --disable-cpplib        use the old isolated C preprocessor.],
+if test x$enable_cpplib = xno; then
+  cpp_main=cccp
 fi)
 
 # Link cpplib into the compiler proper, for C/C++/ObjC.
@@ -236,15 +236,6 @@ if test x$enable_c_cpplib != xno; then
   cpp_main=cppmain
 fi)
 
-# Disable fast fixincludes
-AC_ARG_ENABLE(fast-fixincludes,
-[  --disable-fast-fixincludes
-                         Disable the new fast fixincludes.
-                         Run the old fixincludes script unconditionally],
-if test x$enable_fast_fixincludes = xno ; then
-  cp $srcdir/fixincludes ./fixinc.sh
-fi)
-
 # Enable Multibyte Characters for C/C++
 AC_ARG_ENABLE(c-mbchar,
 [  --enable-c-mbchar       Enable multibyte characters for C and C++.],
@@ -295,7 +286,7 @@ fi,
 objc_boehm_gc='')
 
 AC_ARG_WITH(dwarf2,
-[  --enable-dwarf2       enable DWARF2 debugging as default.],
+[  --with-dwarf2         force the default debug format to be DWARF2.],
 dwarf2="$with_dwarf2",
 dwarf2=no)
 
@@ -1132,7 +1123,6 @@ changequote([,])dnl
                xmake_file=pa/x-pa-mpeix 
                echo "You must use gas. Assuming it is already installed." 
                install_headers_dir=install-headers-tar
-               fixincludes=Makefile.in
                use_collect2=yes 
                ;; 
        i370-*-opened*)                  # IBM 360/370/390 Architecture
@@ -1140,20 +1130,17 @@ changequote([,])dnl
                tm_file=i370/oe.h
                xmake_file=i370/x-oe
                tmake_file=i370/t-oe
-               fixincludes=Makefile.in # Headers are wierd, don't mess with
                ;;
        i370-*-mvs*)
                xm_file=i370/xm-mvs.h
                tm_file=i370/mvs.h
                tmake_file=i370/t-mvs
-               fixincludes=Makefile.in # Headers are wierd, don't mess with
                ;;
        i370-*-linux*)
                xm_file="xm-linux.h i370/xm-linux.h"
                xmake_file=x-linux
                tm_file="i370/linux.h ${tm_file}"
                tmake_file="t-linux i370/t-linux"
-               fixincludes=Makefile.in # The headers are ok already.
                # broken_install=yes
                extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
                # extra_parts="crtbegin.o crtend.o"
@@ -1295,7 +1282,6 @@ changequote([,])dnl
                xmake_file=i386/x-beos
                extra_objs=winnt.o
                extra_parts='crtbegin.o crtend.o'
-               fixincludes=Makefile.in
                ;;
 changequote(,)dnl
        i[34567]86-*-bsdi* | i[34567]86-*-bsd386*)
@@ -1505,19 +1491,19 @@ changequote([,])dnl
                tmake_file="i386/t-go32 t-rtems"
                ;;
 changequote(,)dnl
-       i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
+       i[34567]86-*-rtemscoff*)
 changequote([,])dnl
                cpu_type=i386
-               tm_file=i386/rtemself.h
-               extra_parts="crtbegin.o crtend.o crti.o crtn.o"
-               tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
+               tm_file=i386/rtems.h
+               tmake_file="i386/t-i386bare t-rtems"
                ;;
 changequote(,)dnl
-       i[34567]86-*-rtemscoff*)
+       i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
 changequote([,])dnl
                cpu_type=i386
-               tm_file=i386/rtems.h
-               tmake_file="i386/t-i386bare t-rtems"
+               tm_file=i386/rtemself.h
+               extra_parts="crtbegin.o crtend.o crti.o crtn.o"
+               tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
                ;;
 changequote(,)dnl
        i[34567]86-*-sco3.2v5*) # 80386 running SCO Open Server 5
@@ -3844,7 +3830,7 @@ then tmake_file=$cpu_type/t-$cpu_type
 fi
 
 if test x"$dwarf2" = xyes
-then tm_file="tm-dwarf2.h $tm_file"
+then tm_file="$tm_file tm-dwarf2.h"
 fi
 
 if test x$float_format = x
@@ -4821,7 +4807,6 @@ AC_SUBST(extra_objs)
 AC_SUBST(extra_parts)
 AC_SUBST(extra_passes)
 AC_SUBST(extra_programs)
-AC_SUBST(fixinc_defs)
 AC_SUBST(float_h_file)
 AC_SUBST(gcc_gxx_include_dir)
 AC_SUBST(gcc_version)