*** empty log message ***

From-SVN: r862

2 files changed, 16 insertions, 15 deletions

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 571c4ae..5515960 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -466,7 +466,7 @@ float.h: enquire
 enquire: enquire.o $(GCC_PARTS)
 	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ENQUIRE_LDFLAGS) enquire.o -o $@
 enquire.o: $(srcdir)/enquire.c $(GCC_PASSES)
-	if [ "$(srcdir)" != "." ]; then rm -f enquire.c; else false; fi
+	-if [ "$(srcdir)" != "." ]; then rm -f enquire.c; else true; fi
 	-cp $(srcdir)/enquire.c . > /dev/null 2>&1
 # Breaking this line caused a problem with one version of GNU make.
 	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ALL_CPPFLAGS) $(ENQUIRE_CFLAGS) -I. -c enquire.c
@@ -741,7 +741,7 @@ rtl.o : rtl.c $(CONFIG_H) $(RTL_H)
 print-rtl.o : print-rtl.c $(CONFIG_H) $(RTL_H)
 rtlanal.o : rtlanal.c $(CONFIG_H) $(RTL_H)
 
-varasm.o : varasm.c $(CONFIG_H) $(TREE_H) $(RTL_H) flags.h \
+varasm.o : varasm.c $(CONFIG_H) $(TREE_H) $(RTL_H) flags.h defaults.h \
    insn-codes.h expr.h hard-reg-set.h regs.h xcoffout.h
 function.o : function.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h function.h  \
    insn-flags.h insn-codes.h expr.h regs.h hard-reg-set.h insn-config.h \
@@ -1431,8 +1431,8 @@ install-common-headers: install-dir $(USER_H) gvarargs.h gstdarg.h gstddef.h
 # so that fixinc.svr4 can get at it if necessary.
 # If the dirs are the same, this won't do anything.
 # Delete file first in case it is read-only
-	if [ "$(srcdir)" != "." ]; then rm -f byteorder.h; else false; fi
-	-cp $(srcdir)/byteorder.h .
+	-if [ "$(srcdir)" != "." ]; then rm -f byteorder.h; else true; fi
+	-cp $(srcdir)/byteorder.h . > /dev/null 2>&1
 
 # $(libsubdir)/include:
 #	-if [ -d $(libsubdir)/include ] ; then true ; else mkdir $(libsubdir)/include ; fi
@@ -1556,8 +1556,11 @@ maketest:
 	-rm tm.h aux-output.c config.h md
 	make clean
 # You must then run config to set up for compilation.
-
-bootstrap: all force
+bootstrap: force
+# Only build the C compiler for stage1, because that is the only one that
+# we can guarantee will build with the native compiler, and also it is the
+# only thing useful for building stage2.
+	$(MAKE) LANGUAGES=c
 	$(MAKE) stage1
 # This used to define ALLOCA as empty, but that would lead to bad results
 # for a subsequent `make install' since that would not have ALLOCA empty.
diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 1650a00..d94ce50 100644
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -2226,6 +2226,7 @@ init_decl_processing ()
   tree traditional_ptr_type_node;
   /* Data type of memcpy.  */
   tree memcpy_ftype;
+  tree void_ftype_any;
   int wchar_type_size;
   tree temp;
 
@@ -2386,6 +2387,9 @@ init_decl_processing ()
 
   endlink = tree_cons (NULL_TREE, void_type_node, NULL_TREE);
 
+  void_ftype_any
+    = build_function_type (void_type_node, 0);
+
   double_ftype_double
     = build_function_type (double_type_node,
 			   tree_cons (NULL_TREE, double_type_node, endlink));
@@ -2486,7 +2490,6 @@ init_decl_processing ()
 		    BUILT_IN_ALLOCA, "alloca");
   if (! flag_no_builtin && !flag_no_nonansi_builtin)
     {
-      tree exit_type;
       temp = builtin_function ("alloca",
 			       build_function_type (ptr_type_node,
 						    tree_cons (NULL_TREE,
@@ -2495,7 +2498,7 @@ init_decl_processing ()
 			       BUILT_IN_ALLOCA, 0);
       /* Suppress error if redefined as a non-function.  */
       DECL_BUILT_IN_NONANSI (temp) = 1;
-      temp = builtin_function ("_exit", exit_type, NOT_BUILT_IN, 0);
+      temp = builtin_function ("_exit", void_ftype_any, NOT_BUILT_IN, 0);
       TREE_THIS_VOLATILE (temp) = 1;
       TREE_SIDE_EFFECTS (temp) = 1;
       /* Suppress error if redefined as a non-function.  */
@@ -2548,8 +2551,6 @@ init_decl_processing ()
      However, honor the -fno-builtin option.  */
   if (!flag_no_builtin)
     {
-      tree exit_type;
-
       builtin_function ("abs", int_ftype_int, BUILT_IN_ABS, 0);
       builtin_function ("fabs", double_ftype_double, BUILT_IN_FABS, 0);
       builtin_function ("labs", long_ftype_long, BUILT_IN_LABS, 0);
@@ -2564,17 +2565,14 @@ init_decl_processing ()
 	 to avoid spurious "control drops through" warnings.  */
       /* Don't specify the argument types, to avoid errors
 	 from certain code which isn't valid in ANSI but which exists.  */
-      temp = builtin_function ("abort",
-			       build_function_type (void_type_node, 0),
-			       NOT_BUILT_IN, 0);
+      temp = builtin_function ("abort", void_ftype_any, NOT_BUILT_IN, 0);
       TREE_THIS_VOLATILE (temp) = 1;
       TREE_SIDE_EFFECTS (temp) = 1;
 #if 0
       /* Suppress error if redefined as a non-function.  */
       DECL_BUILT_IN_NONANSI (temp) = 1;
 #endif
-      exit_type = build_function_type (void_type_node, 0);
-      temp = builtin_function ("exit", exit_type, NOT_BUILT_IN, 0);
+      temp = builtin_function ("exit", void_ftype_any, NOT_BUILT_IN, 0);
       TREE_THIS_VOLATILE (temp) = 1;
       TREE_SIDE_EFFECTS (temp) = 1;
 #if 0