Next 3.3; libgcc2.a problems in gcc/Makefile.in

[James McKelvey]

GCC 2.95.2

Next Cube running NextSTEP 4.2, 3.3 Developer

The first patch segment ensures that libgcc2.a is properly ranlib'd.

The remaining two add libgcc2.a to the links for gen-protos and fix-header  
in order to satisfy undefined externals such as ___ashldi3.


*** Makefile.in.orig    Thu Dec 23 18:19:14 1999
--- Makefile.in Sat Dec 25 20:54:07 1999
***************
*** 1143,1154 ****
        done
        mv tmplibgcc2.a libgcc2.a
  # These lines were deleted from above the mv command
! # because ranlibing libgcc.a itself should suffice.
! #     -if [ x${HPUX_GAS} = x ] ; then \
! #       if $(RANLIB_TEST_FOR_TARGET) ; then \
! #         $(RANLIB_FOR_TARGET) tmplibgcc2.a;
! #       else true; fi; \
! #     else true; fi

  # Combine the various libraries into a single library, libgcc.a.
  libgcc.a: $(LIBGCC1) $(LIBGCC2)
--- 1143,1154 ----
        done
        mv tmplibgcc2.a libgcc2.a
  # These lines were deleted from above the mv command
! # because ranlibing libgcc2.a itself should suffice.
!       -if [ x${HPUX_GAS} = x ] ; then \
!         if $(RANLIB_TEST_FOR_TARGET) ; then \
!           $(RANLIB_FOR_TARGET) libgcc2.a; \
!         else true; fi; \
!       else true; fi

  # Combine the various libraries into a single library, libgcc.a.
  libgcc.a: $(LIBGCC1) $(LIBGCC2)
***************
*** 2200,2206 ****
          touch deduced.h; \
        fi

! GEN_PROTOS_OBJS = gen-protos.o scan.o libcpp.a
  gen-protos: $(GEN_PROTOS_OBJS) $(HOST_LIBDEPS)
        ${HOST_CC} $(HOST_CFLAGS) $(HOST_LDFLAGS) -o gen-protos \
          $(GEN_PROTOS_OBJS) $(HOST_LIBS)
--- 2200,2206 ----
          touch deduced.h; \
        fi

! GEN_PROTOS_OBJS = gen-protos.o scan.o libcpp.a libgcc2.a
  gen-protos: $(GEN_PROTOS_OBJS) $(HOST_LIBDEPS)
        ${HOST_CC} $(HOST_CFLAGS) $(HOST_LDFLAGS) -o gen-protos \
          $(GEN_PROTOS_OBJS) $(HOST_LIBS)
***************
*** 2221,2229 ****
        rm -rf fixtmp.c

  fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(HOST_LIBDEPS) \
!           libcpp.a
        $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ fix-header.o \
!          scan-decls.o scan.o libcpp.a $(HOST_LIBS)

  fix-header.o: fix-header.c $(srcdir)/../include/obstack.h scan.h \
        xsys-protos.h $(build_xm_file) system.h cpplib.h cpphash.h
--- 2221,2229 ----
        rm -rf fixtmp.c

  fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(HOST_LIBDEPS) \
!           libcpp.a libgcc2.a
        $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ fix-header.o \
!          scan-decls.o scan.o libcpp.a libgcc2.a $(HOST_LIBS)

  fix-header.o: fix-header.c $(srcdir)/../include/obstack.h scan.h \
        xsys-protos.h $(build_xm_file) system.h cpplib.h cpphash.h

---
Where diesel guitars from faraway bars, blast out the
best songs from our holy wars. Coyote carnival catches
on fire, all the cops in the world pick us up on radar.
Jim McKelvey  mckelvey@fafnir.com