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

	* 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce98498f3e99c1a4f735418cbc34a42286bb1d0c..d350d9deaf6223cc854ca9b52d662f3c70f1155a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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
@@ -50,12 +57,12 @@
        * config/rs6000/rs6000-modes.def: Likewise.
        * config/sh/sh-modes.def: Likewise.
 
-2004-07-23  Matthias Klose  <doko@debian.org> 
- 
-       * intl.c (gcc_init_libintl): Use PACKAGE for the text domain. 
-       * configure.ac: Add AC_DEFINE_UNQUOTED for PACKAGE. 
+2004-07-23  Matthias Klose  <doko@debian.org>
+
+       * intl.c (gcc_init_libintl): Use PACKAGE for the text domain.
+       * configure.ac: Add AC_DEFINE_UNQUOTED for PACKAGE.
        * config.h: Regenerate.
-       * configure: Likewise. 
+       * configure: Likewise.
 
 2004-07-22  Mark Mitchell  <mark@codesourcery.com>
 
@@ -132,7 +139,7 @@
        (rs6000_emit_prologue): Use machopic_function_base_sym.
        (output_profile_hook): Do not use machopic_stub_name.
        (macho_branch_isalnds): Do not use darwin_strip_name_encoding.
-       
+
 2004-07-22  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        PR c/7284
@@ -157,7 +164,7 @@
        * tree-ssa-ccp.c (latticevalue): Add UNKNOWN_VAL.
        (substitute_and_fold): Propigate into VUSE operands when possible.
        (visit_phi_node): Handle UNKNOWN_VAL latticevalue.
-       (cp_lattice_meet): Handle merging of latticevalues when 
+       (cp_lattice_meet): Handle merging of latticevalues when
        UNKNOWN_VAL is present.
        (visit_stmt): Visit assignments with V_MUST_DEFs.
        (visit_assignment): Gather ccp information for V_MUST_DEF operands.
@@ -165,13 +172,13 @@
        (evaluate_stmt): Handle UNKNOWN_VAL likely values.
        (dump_lattice_value): Dump UNKNOWN_VAL latticevalues.
        (initialize): Mark statements with V_MUST_DEFs as VARYING only if the
-       V_MUST_DEF operand is VARYING. Fix comment and include VOPS when 
+       V_MUST_DEF operand is VARYING. Fix comment and include VOPS when
        computing immediate uses.
-       (set_lattice_value): Disallow a UNKNOWN_VAL->UNDEFINED state 
+       (set_lattice_value): Disallow a UNKNOWN_VAL->UNDEFINED state
        transition.
        (replace_vuse_in): New function.
        (likely_value): Add check of vuse operands.
-       (get_default_value): Set the default value of virtually defined 
+       (get_default_value): Set the default value of virtually defined
        variables to UKNOWN_VAL instead of VARYING.
 
 2004-07-22  Richard Henderson  <rth@redhat.com>

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index e57458b1302472fbc337de33902b6ded2d8b9d3c..e7f37be97980c93de3cbda83bc66cf087ceec4bd 100644 (file)
--- a/gcc/Makefile.in
+++ b/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

diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index 8b211f076acd9e4c9009a91bc7c41d39100efa62..7ae35a08f0ae4639cd8077e66a59f293dd295248 100644 (file)
--- a/gcc/print-rtl.c
+++ b/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;