This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

libgcc makeury patch


These changes are necessary for a change in one of the C++ runtime
sources to cause a libgcc rebuild.

2000-06-02  Jason Merrill  <jason@casey.soma.redhat.com>

	* Makefile.in (libgcc.a): Also depend on $(LIB2ADD).
	* mklibgcc.in (force): New target.
	Make LIB2ADD stuff depend on it.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/Makefile.in,v
retrieving revision 1.457
diff -c -p -r1.457 Makefile.in
*** Makefile.in	2000/06/01 10:13:19	1.457
--- Makefile.in	2000/06/03 01:36:10
*************** libgcc.mk: config.status Makefile mklibg
*** 972,978 ****
  	  $(SHELL) mklibgcc > tmp-libgcc.mk
  	$(SHELL) $(srcdir)/move-if-change tmp-libgcc.mk libgcc.mk
  
! libgcc.a: libgcc.ready libgcc.mk $(FPBIT) $(DPBIT)
  	$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
  	  HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
  	  AR_FOR_TARGET="$(AR_FOR_TARGET)" \
--- 972,978 ----
  	  $(SHELL) mklibgcc > tmp-libgcc.mk
  	$(SHELL) $(srcdir)/move-if-change tmp-libgcc.mk libgcc.mk
  
! libgcc.a: libgcc.ready libgcc.mk $(FPBIT) $(DPBIT) $(LIB2ADD)
  	$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
  	  HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
  	  AR_FOR_TARGET="$(AR_FOR_TARGET)" \
Index: mklibgcc.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/mklibgcc.in,v
retrieving revision 1.11
diff -c -p -r1.11 mklibgcc.in
*** mklibgcc.in	2000/05/28 21:52:37	1.11
--- mklibgcc.in	2000/06/03 01:36:10
*************** echo 'srcdir = @srcdir@'
*** 29,34 ****
--- 29,36 ----
  echo 'VPATH = @srcdir@'
  echo 'EQ = ='
  echo
+ echo 'force:'
+ echo
  
  # Detect gcc as OLDCC.  This indicates a target for which LIB1FUNCS
  # is not needed.  This is not quite the same as libgcc1.null, even
*************** for file in $LIB2ADD; do
*** 237,243 ****
      fprime=`cat $file`
      for f in $fprime; do
  
!       lastout=""
        for ml in $MULTILIBS; do
          dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
          flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
--- 239,245 ----
      fprime=`cat $file`
      for f in $fprime; do
  
!       lastout="force"
        for ml in $MULTILIBS; do
          dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
          flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
*************** for ml in $MULTILIBS; do
*** 317,323 ****
  done
  
  for f in $EXTRA_MULTILIB_PARTS; do
!   lastout=""
    for ml in $MULTILIBS; do
      dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
      flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
--- 319,325 ----
  done
  
  for f in $EXTRA_MULTILIB_PARTS; do
!   lastout="force"
    for ml in $MULTILIBS; do
      dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
      flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]