2008-03-27 Paolo Bonzini <bonzini@gnu.org>

	* config.cc (m68hc11, m6811, m68hc12, m6812): Add usegas.h,
	rename tmake_file to m68hc11/t-m68hc11.
	(mcore): Set inhibit_libc to true.
	* config.host (alpha*-dec-*vms*): Set extra_programs.
	(interix3*): Don't use host_xmake_file.
	* configure.ac: Let config.gcc override inhibit_libc.
	* configure: Regenerate.

	* config/alpha/x-vms (EXTRA_PROGRAMS): Remove.
	* config/x-interix: Remove.

	* config/t-openbsd-thread: Remove commented out lines.

	* config/m68hc11/t-m68hc11-gas: Rename to...
	* config/m68hc11/t-m68hc11: ... this.  Remove T_CPPFLAGS.

	* config/mcore/t-mcore: Remove T_CFLAGS.
	* config/mcore/t-mcore-pe: Likewise.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@133636 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 30 insertions, 19 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c9c46a5258a..d04b4ac5830 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,26 @@
 2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
 
+	* config.cc (m68hc11, m6811, m68hc12, m6812): Add usegas.h,
+	rename tmake_file to m68hc11/t-m68hc11.
+	(mcore): Set inhibit_libc to true.
+	* config.host (alpha*-dec-*vms*): Set extra_programs.
+	(interix3*): Don't use host_xmake_file.
+	* configure.ac: Let config.gcc override inhibit_libc.
+	* configure: Regenerate.
+
+	* config/alpha/x-vms (EXTRA_PROGRAMS): Remove.
+	* config/t-openbsd-thread: Remove commented out lines.
+	
+	* config/x-interix: Remove.
+
+	* config/m68hc11/t-m68hc11-gas: Rename to...
+	* config/m68hc11/t-m68hc11: ... this.  Remove T_CPPFLAGS.
+
+	* config/mcore/t-mcore: Remove T_CFLAGS.
+	* config/mcore/t-mcore-pe: Likewise.
+
+2008-03-27  Paolo Bonzini  <bonzini@gnu.org>
+
 	* configure.ac: Replace custom __GNU_SOURCE test with
 	AC_USE_SYSTEM_EXTENSIONS.  Move it earlier.
 	* aclocal.m4: Regenerate.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 8d0217e8f92..f9f2fa4aa72 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1516,19 +1516,19 @@ m32rle-*-linux*)
 	;;
 # m68hc11 and m68hc12 share the same machine description.
 m68hc11-*-*|m6811-*-*)
-	tm_file="dbxelf.h elfos.h m68hc11/m68hc11.h"
+	tm_file="dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
 	tm_p_file="m68hc11/m68hc11-protos.h"
 	md_file="m68hc11/m68hc11.md"
 	out_file="m68hc11/m68hc11.c"
-	tmake_file="m68hc11/t-m68hc11-gas"
+	tmake_file="m68hc11/t-m68hc11"
 	use_fixproto=yes
         ;;
 m68hc12-*-*|m6812-*-*)
-	tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h m68hc11/m68hc11.h"
+	tm_file="m68hc11/m68hc12.h dbxelf.h elfos.h usegas.h m68hc11/m68hc11.h"
 	tm_p_file="m68hc11/m68hc11-protos.h"
 	md_file="m68hc11/m68hc11.md"
 	out_file="m68hc11/m68hc11.c"
-	tmake_file="m68hc11/t-m68hc11-gas"
+	tmake_file="m68hc11/t-m68hc11"
 	extra_options="${extra_options} m68hc11/m68hc11.opt"
 	use_fixproto=yes
         ;;
@@ -1641,11 +1641,13 @@ mcore-*-elf)
 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
 	tmake_file=mcore/t-mcore
 	use_fixproto=yes
+	inhibit_libc=true
 	;;
 mcore-*-pe*)
 	tm_file="svr3.h dbxcoff.h ${tm_file} mcore/mcore-pe.h"
 	tmake_file=mcore/t-mcore-pe
 	use_fixproto=yes
+	inhibit_libc=true
 	;;
 mips-sgi-irix[56]*)
 	tm_file="elfos.h ${tm_file} mips/iris.h"
diff --git a/gcc/config.host b/gcc/config.host
index 93d97f1ce0d..965288a29f4 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -124,6 +124,7 @@ case ${host} in
   alpha*-dec-*vms*)
     host_xm_file=alpha/xm-vms.h
     host_xmake_file="${host_xmake_file} alpha/x-vms"
+    extra_programs="ld.exe decc.exe"
     host_exeext=.exe
     host_can_use_collect2=no
     # This removes the cpu type and manufacturer components and
@@ -191,9 +192,6 @@ case ${host} in
     echo "*** linking with posix.dll is not allowed by the GNU GPL."
     exit 1
     ;;
-  i[34567]86-*-interix3*)
-    host_xmake_file="${host_xmake_file} x-interix"
-    ;;
   i[34567]86-*-darwin* | x86_64-*-darwin*)
     out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o"
     host_xmake_file="${host_xmake_file} i386/x-darwin"
diff --git a/gcc/config/alpha/x-vms b/gcc/config/alpha/x-vms
index 053263a60c5..3b47bebe636 100644
--- a/gcc/config/alpha/x-vms
+++ b/gcc/config/alpha/x-vms
@@ -5,7 +5,6 @@ libsubdir=$(libdir)/gcc-lib
 
 # Rules for linker and compiler wrappers.  These are only useful on
 # a VMS host.
-EXTRA_PROGRAMS=ld.exe decc.exe
 vms-ld.o : $(srcdir)/config/alpha/vms-ld.c
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 ld.exe : vms-ld.o
diff --git a/gcc/config/m68hc11/t-m68hc11-gas b/gcc/config/m68hc11/t-m68hc11
index b8450a68237..7978641f904 100644
--- a/gcc/config/m68hc11/t-m68hc11-gas
+++ b/gcc/config/m68hc11/t-m68hc11
@@ -13,8 +13,6 @@ RANLIB_FOR_TARGET = ` \
     fi; \
   fi`
 
-T_CPPFLAGS = -DUSE_GAS
-
 LIB1ASMSRC = m68hc11/larith.asm
 LIB1ASMFUNCS = _mulsi3 \
 	_mulqi3 _ashlsi3 _ashrsi3 _lshrsi3 \
diff --git a/gcc/config/mcore/t-mcore b/gcc/config/mcore/t-mcore
index 313853d399a..9480bd0ffd8 100644
--- a/gcc/config/mcore/t-mcore
+++ b/gcc/config/mcore/t-mcore
@@ -27,7 +27,6 @@ fp-bit.c: $(srcdir)/config/fp-bit.c $(srcdir)/config/mcore/t-mcore
 	echo '#define FLOAT' > fp-bit.c
 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
 
-T_CFLAGS = -DDONT_HAVE_STDIO -DDONT_HAVE_SETJMP  -Dinhibit_libc 
 # could use -msifilter to be safe from interrupt/jmp interactions and others.
 TARGET_LIBGCC2_CFLAGS=-O3 -DNO_FLOATLIB_FIXUNSDFSI #-msifilter
 
diff --git a/gcc/config/mcore/t-mcore-pe b/gcc/config/mcore/t-mcore-pe
index 294f40475a7..745006e2e2a 100644
--- a/gcc/config/mcore/t-mcore-pe
+++ b/gcc/config/mcore/t-mcore-pe
@@ -17,7 +17,6 @@ fp-bit.c: $(srcdir)/config/fp-bit.c $(srcdir)/config/mcore/t-mcore
 	echo '#define FLOAT' > fp-bit.c
 	cat $(srcdir)/config/fp-bit.c >> fp-bit.c
 
-T_CFLAGS = -DDONT_HAVE_STDIO -DDONT_HAVE_SETJMP  -Dinhibit_libc 
 # could use -msifilter to be safe from interrupt/jmp interactions and others.
 TARGET_LIBGCC2_CFLAGS=-O3 -DNO_FLOATLIB_FIXUNSDFSI #-msifilter
 
diff --git a/gcc/config/t-openbsd-thread b/gcc/config/t-openbsd-thread
index 4b25f25a4e5..5f4edf567c5 100644
--- a/gcc/config/t-openbsd-thread
+++ b/gcc/config/t-openbsd-thread
@@ -1,5 +1,3 @@
 # This is currently needed to compile libgcc2 for threads support
 TARGET_LIBGCC2_CFLAGS=-pthread
-#T_CFLAGS=-pthread
-#T_CPPFLAGS=-pthread
 
diff --git a/gcc/config/x-interix b/gcc/config/x-interix
deleted file mode 100644
index e5393316dc0..00000000000
--- a/gcc/config/x-interix
+++ /dev/null
@@ -1,3 +0,0 @@
-# Existing CC/GCC may not define -D__INTERIX, so need this here.
-# Since we want to configure with _ALL_SOURCE, we need to build that way too
-X_CFLAGS= -D__INTERIX -D_ALL_SOURCE
diff --git a/gcc/configure b/gcc/configure
index f14366c98ad..04104ccf29b 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -13683,7 +13683,7 @@ fi
 # then define inhibit_libc in LIBGCC2_CFLAGS.
 # This prevents libgcc2 from containing any code which requires libc
 # support.
-inhibit_libc=false
+: ${inhibit_libc=false}
 if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
        test x$with_newlib = xyes ; } &&
      { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 10e6a9eca58..202a1c4d03e 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1738,7 +1738,7 @@ fi
 # then define inhibit_libc in LIBGCC2_CFLAGS.
 # This prevents libgcc2 from containing any code which requires libc
 # support.
-inhibit_libc=false
+: ${inhibit_libc=false}
 if { { test x$host != x$target && test "x$with_sysroot" = x ; } ||
        test x$with_newlib = xyes ; } &&
      { test "x$with_headers" = x || test "x$with_headers" = xno ; } ; then