print-rtl.c (print_rtx <case 'b'>): Don't attempt to print bitmap contents if…

print-rtl.c (print_rtx <case 'b'>): Don't attempt to print bitmap contents if GENERATOR_FILE is defined.

	* print-rtl.c (print_rtx <case 'b'>): Don't attempt to print
	bitmap contents if GENERATOR_FILE is defined.
	* Makefile.in (BUILD_RTL): Remove $(BUILD_PREFIX)bitmap.o.
	($(BUILD_PREFIX_1)bitmap.o): Delete rule.

From-SVN: r85095

gcc/ChangeLog

+2004-07-23  Zack Weinberg  <zack@codesourcery.com>
+
+	* print-rtl.c (print_rtx <case 'b'>): Don't attempt to print
+	bitmap contents if GENERATOR_FILE is defined.
+	* Makefile.in (BUILD_RTL): Remove $(BUILD_PREFIX)bitmap.o.
+	($(BUILD_PREFIX_1)bitmap.o): Delete rule.
+
 2004-07-23  Joseph S. Myers  <jsm@polyomino.org.uk>
 
 	* c-decl.c (start_function): Form composite type of function types

gcc/Makefile.in

@@ -773,7 +773,7 @@ LDEXP_LIB = @LDEXP_LIB@
 # even if we are cross-building GCC.
 BUILD_LIBS = $(BUILD_LIBIBERTY)
 
-BUILD_RTL = $(BUILD_PREFIX)rtl.o read-rtl.o $(BUILD_PREFIX)bitmap.o \
+BUILD_RTL = $(BUILD_PREFIX)rtl.o read-rtl.o \
 		$(BUILD_PREFIX)ggc-none.o min-insn-modes.o
 BUILD_SUPPORT = gensupport.o insn-conditions.o
 BUILD_EARLY_SUPPORT = gensupport.o dummy-conditions.o
@@ -2589,12 +2589,6 @@ print-rtl1.o: $(srcdir)/print-rtl.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \
 	sed -e 's/config[.]h/bconfig.h/' $(srcdir)/print-rtl.c > print-rtl1.c
 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) print-rtl1.c $(OUTPUT_OPTION)
 
-$(BUILD_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H) \
-  $(RTL_H) $(FLAGS_H) $(BASIC_BLOCK_H) $(REGS_H) $(GGC_H)
-	rm -f $(BUILD_PREFIX)bitmap.c
-	sed -e 's/config[.]h/bconfig.h/' $(srcdir)/bitmap.c > $(BUILD_PREFIX)bitmap.c
-	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)bitmap.c $(OUTPUT_OPTION)
-
 $(BUILD_PREFIX_1)errors.o: errors.c $(BCONFIG_H) $(SYSTEM_H) errors.h
 	rm -f $(BUILD_PREFIX)errors.c
 	sed -e 's/config[.]h/bconfig.h/' $(srcdir)/errors.c > $(BUILD_PREFIX)errors.c

gcc/print-rtl.c

@@ -484,10 +484,14 @@ print_rtx (rtx in_rtx)
 	break;
 
       case 'b':
+#ifdef GENERATOR_FILE
+	fputs (" {bitmap}", outfile);
+#else
 	if (XBITMAP (in_rtx, i) == NULL)
 	  fputs (" {null}", outfile);
 	else
 	  bitmap_print (outfile, XBITMAP (in_rtx, i), " {", "}");
+#endif
 	sawclose = 0;
 	break;