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]

PATCH: Fix -shared-libgcc logic



The tangled web of Make, shell, and autoconf gunk needed a little more
tweaking.  What a mess this is.

With this change, I think we should again be using libgcc.so on
platforms where we need it.

--
Mark Mitchell                   mark@codesourcery.com
CodeSourcery, LLC               http://www.codesourcery.com

2001-02-11  Mark Mitchell  <mark@codesourcery.com>

	* Makefile.in (gcc.o): Fix typos.
	(protize.o): Likewise.
	(unprotoize.o): Likewise.

2001-02-11  Mark Mitchell  <mark@codesourcery.com>

	* Makefile.in (g++spec.o): Fix typo.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.599
diff -c -p -r1.599 Makefile.in
*** Makefile.in	2001/02/06 06:36:08	1.599
--- Makefile.in	2001/02/11 20:53:53
*************** DRIVER_DEFINES = \
*** 1273,1283 ****
  
  gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
      Makefile $(lang_specs_files) prefix.h $(GCC_H)
! 	SHLIB_LIB='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
  	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
    $(DRIVER_DEFINES) \
!   -c $(srcdir)/gcc.c
  
  gccspec.o: gccspec.c $(CONFIG_H) system.h $(GCC_H)
  cppspec.o: cppspec.c $(CONFIG_H) system.h $(GCC_H)
--- 1273,1283 ----
  
  gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
      Makefile $(lang_specs_files) prefix.h $(GCC_H)
! 	(SHLIB_LINK='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
  	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
    $(DRIVER_DEFINES) \
!   -c $(srcdir)/gcc.c)
  
  gccspec.o: gccspec.c $(CONFIG_H) system.h $(GCC_H)
  cppspec.o: cppspec.c $(CONFIG_H) system.h $(GCC_H)
*************** unprotoize$(exeext): unprotoize.o $(PROT
*** 1978,1996 ****
  
  protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) system.h \
     Makefile version.h
! 	SHLIB_LIB='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
  	  $(DRIVER_DEFINES) $(PREPROCESSOR_DEFINES) \
! 	  $(srcdir)/protoize.c $(OUTPUT_OPTION)
  
  unprotoize.o: unprotoize.c protoize.c $(srcdir)/../include/getopt.h \
     $(CONFIG_H) system.h Makefile version.h
! 	SHLIB_LIB='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
  	  $(DRIVER_DEFINES) $(PREPROCESSOR_DEFINES) \
! 	  $(srcdir)/unprotoize.c $(OUTPUT_OPTION)
  
  # This info describes the target machine, so compile with GCC just built.
  SYSCALLS.c.X: $(srcdir)/sys-types.h $(srcdir)/sys-protos.h $(GCC_PASSES) \
--- 1978,1996 ----
  
  protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) system.h \
     Makefile version.h
! 	(SHLIB_LINK='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
  	  $(DRIVER_DEFINES) $(PREPROCESSOR_DEFINES) \
! 	  $(srcdir)/protoize.c $(OUTPUT_OPTION))
  
  unprotoize.o: unprotoize.c protoize.c $(srcdir)/../include/getopt.h \
     $(CONFIG_H) system.h Makefile version.h
! 	(SHLIB_LINK='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
  	  $(DRIVER_DEFINES) $(PREPROCESSOR_DEFINES) \
! 	  $(srcdir)/unprotoize.c $(OUTPUT_OPTION))
  
  # This info describes the target machine, so compile with GCC just built.
  SYSCALLS.c.X: $(srcdir)/sys-types.h $(srcdir)/sys-protos.h $(GCC_PASSES) \
Index: cp/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/Make-lang.in,v
retrieving revision 1.76
diff -c -p -r1.76 Make-lang.in
*** Make-lang.in	2001/02/05 09:48:00	1.76
--- Make-lang.in	2001/02/11 20:54:07
*************** C++ c++: cc1plus$(exeext)
*** 61,70 ****
  .PHONY: C++ c++
  
  g++spec.o: $(srcdir)/cp/g++spec.c system.h $(GCC_H) $(CONFIG_H)
! 	SHLIB_LIB='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)' \
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
! 		$(INCLUDES) $(srcdir)/cp/g++spec.c
  
  $(INTL_TARGETS): $(srcdir)/cp/parse.c
  
--- 61,70 ----
  .PHONY: C++ c++
  
  g++spec.o: $(srcdir)/cp/g++spec.c system.h $(GCC_H) $(CONFIG_H)
! 	(SHLIB_LINK='$(SHLIB_LINK)' \
! 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
  	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(DRIVER_DEFINES) \
! 		$(INCLUDES) $(srcdir)/cp/g++spec.c)
  
  $(INTL_TARGETS): $(srcdir)/cp/parse.c
  


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