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]

C++ PATCH: Remove demangler from libgcc



The new demangler had been linked into libgcc.  However, the new
demangler is under the GPL (rather than under the same license used by
other parts of libgcc).  That could cause users to link in GPL'd code
without meaning to; therefore this patch removes the code from libgcc.

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

2000-08-25  Mark Mitchell  <mark@codesourcery.com>

	* Make-lang.in (CXX_LIB2FUNCS): Remove cp-demangle.o and
	dyn-string.o.
	(CXX_LIB2SRCS): Remove cp-demangle.c and dyn-string.c.
	(cp-demangle.o): Remove target.
	(dyn-string.o): Likewise.

Index: cp/Make-lang.in
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/Make-lang.in,v
retrieving revision 1.58
diff -c -p -r1.58 Make-lang.in
*** Make-lang.in	2000/08/05 00:50:01	1.58
--- Make-lang.in	2000/08/25 07:59:18
*************** CXX_EXTRA_HEADERS = $(srcdir)/cp/inc/typ
*** 62,74 ****
  
  # Extra code to include in libgcc2.
  CXX_LIB2FUNCS = tinfo.o tinfo2.o new.o opnew.o opnewnt.o opvnew.o opvnewnt.o \
! 	opdel.o opdelnt.o opvdel.o opvdelnt.o exception.o vec.o \
! 	cp-demangle.o dyn-string.o
  CXX_LIB2SRCS = $(srcdir)/cp/new.cc $(srcdir)/cp/new1.cc $(srcdir)/cp/new2.cc \
  	$(srcdir)/cp/exception.cc $(srcdir)/cp/tinfo.cc \
! 	$(srcdir)/cp/tinfo2.cc $(srcdir)/cp/tinfo.h \
! 	$(srcdir)/../libiberty/cp-demangle.c \
! 	$(srcdir)/../libiberty/dyn-string.c
  #
  # Define the names for selecting c++ in LANGUAGES.
  # Note that it would be nice to move the dependency on g++
--- 62,71 ----
  
  # Extra code to include in libgcc2.
  CXX_LIB2FUNCS = tinfo.o tinfo2.o new.o opnew.o opnewnt.o opvnew.o opvnewnt.o \
! 	opdel.o opdelnt.o opvdel.o opvdelnt.o exception.o vec.o
  CXX_LIB2SRCS = $(srcdir)/cp/new.cc $(srcdir)/cp/new1.cc $(srcdir)/cp/new2.cc \
  	$(srcdir)/cp/exception.cc $(srcdir)/cp/tinfo.cc \
! 	$(srcdir)/cp/tinfo2.cc $(srcdir)/cp/tinfo.h
  #
  # Define the names for selecting c++ in LANGUAGES.
  # Note that it would be nice to move the dependency on g++
*************** opvdelnt.o: cc1plus$(exeext) $(srcdir)/c
*** 181,194 ****
  vec.o: cc1plus$(exeext) $(srcdir)/cp/vec.cc
  	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(GXX_ABI_FLAG) $(CXXFLAGS) $(INCLUDES) \
  	  -c $(srcdir)/cp/vec.cc -o vec.o
- cp-demangle.o: $(srcdir)/../libiberty/cp-demangle.c
- 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CFLAGS) $(INCLUDES) \
- 	 -DHAVE_CONFIG_H \
-          -c $(srcdir)/../libiberty/cp-demangle.c -o cp-demangle.o
- dyn-string.o: $(srcdir)/../libiberty/dyn-string.c
- 	$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(CFLAGS) $(INCLUDES) \
- 	 -DHAVE_CONFIG_H \
- 	 -c $(srcdir)/../libiberty/dyn-string.c -o dyn-string.o
  
  # We want to update cplib2.txt if any of the source files change...
  cplib2.txt: $(CXX_LIB2SRCS) $(CXX_EXTRA_HEADERS)
--- 178,183 ----

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