Re: Patch to fix problem in building libgcc2

[Nathan Sidwell <nathan at acm dot org>]

Jeffrey A Law wrote:
> 
>   In message <199908121900.PAA04097@tiktok.cygnus.com>you write:

>   > 1999-08-12  Michael Meissner  <meissner@cygnus.com>
>   >
>   >     * Makefile.in (GCC_FOR_TARGET): Move -B./ after the tooldir -B so
>   >     that if you are building via a one-tree build, ./as is searched
>   >     for before the installed location.  This is needed in case you
>   >     change the assembler syntax during development.
> Thanks.  I went ahead and installed this.
Jeff, I think you committed more than you intended. I attach the diff from
Makefile.in that you created. You'll notice that this is a bigger change than
Mike's patch. You've made the haifa scheduler non-negotiable, and that
unfortunately breaks the build because -DHAIFA is not (always) supplied.

nathan
-- 
Dr Nathan Sidwell :: Computer Science Department :: Bristol University
        I have seen the death of PhotoShop -- it is called GIMP
nathan@acm.org  http://www.cs.bris.ac.uk/~nathan/  nathan@cs.bris.ac.uk
Index: Makefile.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/gcc/Makefile.in,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -2 -r1.276 -r1.277
--- Makefile.in	1999/08/11 09:40:43	1.276
+++ Makefile.in	1999/08/13 07:47:18	1.277
@@ -167,5 +167,5 @@
 # Usually the one we just built.
 # Don't use this as a dependency--use $(GCC_PASSES) or $(GCC_PARTS).
-GCC_FOR_TARGET = ./xgcc -B./ -B$(build_tooldir)/bin/ -I$(build_tooldir)/include
+GCC_FOR_TARGET = ./xgcc -B$(build_tooldir)/bin/ -B./ -I$(build_tooldir)/include
 
 # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
@@ -534,5 +534,5 @@
 
 # IN_GCC tells various files that system.h, toplev.c, etc are available.
-INTERNAL_CFLAGS = $(CROSS) -DIN_GCC $(SCHED_CFLAGS) @extra_c_flags@
+INTERNAL_CFLAGS = $(CROSS) -DIN_GCC @extra_c_flags@
 
 # This is the variable actually used when we compile.
@@ -658,7 +658,4 @@
 C_OBJS = c-parse.o c-lang.o $(C_AND_OBJC_OBJS)
 
-SCHED_PREFIX = @sched_prefix@
-SCHED_CFLAGS = @sched_cflags@
-
 # Language-independent object files.
 OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \
@@ -668,5 +665,5 @@
  integrate.o jump.o cse.o loop.o unroll.o flow.o stupid.o combine.o varray.o \
  regclass.o regmove.o local-alloc.o global.o reload.o reload1.o caller-save.o \
- insn-peep.o reorg.o $(SCHED_PREFIX)sched.o final.o recog.o reg-stack.o \
+ insn-peep.o reorg.o haifa-sched.o final.o recog.o reg-stack.o \
  insn-opinit.o insn-recog.o insn-extract.o insn-output.o insn-emit.o lcm.o \
  profile.o insn-attrtab.o $(out_object_file) getpwd.o $(EXTRA_OBJS) convert.o \
@@ -1570,5 +1567,5 @@
    $(RECOG_H) output.h reload.h $(REGS_H) hard-reg-set.h flags.h function.h \
    $(EXPR_H) insn-flags.h $(BASIC_BLOCK_H) toplev.h
-$(SCHED_PREFIX)sched.o : $(SCHED_PREFIX)sched.c $(CONFIG_H) system.h $(RTL_H) \
+haifa-sched.o : haifa-sched.c $(CONFIG_H) system.h $(RTL_H) \
    $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \
    insn-attr.h toplev.h recog.h