--- gcc/cp/Make-lang.in 2018/04/24 18:20:22 1.1 +++ gcc/cp/Make-lang.in 2018/04/24 18:27:20 1.1.1.2 @@ -1,5 +1,5 @@ # Top level makefile fragment for GNU C++. -# Copyright (C) 1994 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995 Free Software Foundation, Inc. #This file is part of GNU CC. @@ -15,7 +15,8 @@ #You should have received a copy of the GNU General Public License #along with GNU CC; see the file COPYING. If not, write to -#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +#the Free Software Foundation, 59 Temple Place - Suite 330, +#Boston, MA 02111-1307, USA. # This file provides the language dependent support in the main Makefile. # Each language makefile fragment must provide the following targets: @@ -24,8 +25,8 @@ # foo.info, foo.dvi, # foo.install-normal, foo.install-common, foo.install-info, foo.install-man, # foo.uninstall, foo.distdir, -# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean, foo.realclean, -# foo.stage1, foo.stage2, foo.stage3, foo.stage4 +# foo.mostlyclean, foo.clean, foo.distclean, foo.extraclean, +# foo.maintainer-clean, foo.stage1, foo.stage2, foo.stage3, foo.stage4 # # where `foo' is the name of the language. # @@ -42,13 +43,15 @@ CXX_FLAGS_TO_PASS = \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" # Actual names to use when installing a native compiler. -CXX_INSTALL_NAME = c++ -GXX_INSTALL_NAME = g++ +CXX_INSTALL_NAME = `t='$(program_transform_name)'; echo c++ | sed $$t` +GXX_INSTALL_NAME = `t='$(program_transform_name)'; echo g++ | sed $$t` # Actual names to use when installing a cross-compiler. -CXX_CROSS_NAME = $(target)-c++ -GXX_CROSS_NAME = $(target)-g++ +CXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++ | sed $$t` +GXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g++ | sed $$t` +# The name to use for the demangler program. +DEMANGLER_PROG = c++filt # Define the names for selecting c++ in LANGUAGES. # Note that it would be nice to move the dependency on g++ @@ -56,15 +59,30 @@ GXX_CROSS_NAME = $(target)-g++ # to do the right thing within all.cross. C++ c++: cc1plus +# Tell GNU make to ignore these if they exist. +.PHONY: C++ c++ + # Create the compiler driver for g++. g++: $(srcdir)/cp/g++.c $(CONFIG_H) $(LIBDEPS) - $(CC) $(ALL_CFLAGS) $(INCLUDES) $(LDFLAGS) -o g++ $(srcdir)/cp/g++.c $(LIBS) + $(CC) $(ALL_CFLAGS) $(INCLUDES) $(LDFLAGS) -o $@ $(srcdir)/cp/g++.c $(LIBS) # Create a version of the g++ driver which calls the cross-compiler. -g++-cross: $(srcdir)/cp/g++.c - $(CC) $(ALL_CFLAGS) $(INCLUDES) $(LDFLAGS) -o g++-cross \ +g++-cross: $(srcdir)/cp/g++.c version.o $(LIBDEPS) + $(CC) $(ALL_CFLAGS) $(INCLUDES) $(LDFLAGS) -o $@ \ -DGCC_NAME=\"$(GCC_CROSS_NAME)\" $(srcdir)/cp/g++.c version.o $(LIBS) +cxxmain.o: cplus-dem.c demangle.h + rm -f cxxmain.c + ln -s $(srcdir)/cplus-dem.c cxxmain.c > /dev/null 2>&1 \ + || cp $(srcdir)/cplus-dem.c cxxmain.c + $(CC) -c -DMAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + -DVERSION=\"$(version)\" cxxmain.c + rm -f cxxmain.c + +$(DEMANGLER_PROG): cxxmain.o underscore.o getopt.o getopt1.o $(LIBDEPS) + $(CC) $(ALL_CFLAGS) $(LDFLAGS) $(LIBS) -o $@ \ + cxxmain.o underscore.o getopt.o getopt1.o + CXX_SRCS = $(srcdir)/cp/call.c $(srcdir)/cp/decl2.c \ $(srcdir)/cp/except.c $(srcdir)/cp/input.c $(srcdir)/cp/pt.c \ $(srcdir)/cp/spew.c $(srcdir)/cp/xref.c $(srcdir)/cp/class.c \ @@ -73,17 +91,17 @@ CXX_SRCS = $(srcdir)/cp/call.c $(srcdir) $(srcdir)/cp/errfn.c $(srcdir)/cp/gc.c $(srcdir)/cp/method.c \ $(srcdir)/cp/search.c $(srcdir)/cp/typeck.c $(srcdir)/cp/decl.c \ $(srcdir)/cp/error.c $(srcdir)/cp/init.c $(srcdir)/cp/parse.y \ - $(srcdir)/cp/sig.c $(srcdir)/cp/typeck2.c + $(srcdir)/cp/sig.c $(srcdir)/cp/typeck2.c $(srcdir)/cp/repo.c -cc1plus: $(P) $(CXX_SRCS) $(LIBDEPS) stamp-objlist c-common.o +cc1plus: $(P) $(CXX_SRCS) $(LIBDEPS) stamp-objlist c-common.o c-pragma.o cd cp; $(MAKE) $(FLAGS_TO_PASS) $(CXX_FLAGS_TO_PASS) ../cc1plus # Build hooks: -c++.all.build: g++ -c++.all.cross: g++-cross +c++.all.build: g++ $(DEMANGLER_PROG) +c++.all.cross: g++-cross $(DEMANGLER_PROG) c++.start.encap: g++ -c++.rest.encap: +c++.rest.encap: $(DEMANGLER_PROG) c++.info: c++.dvi: @@ -97,62 +115,74 @@ c++.install-normal: # Install the driver program as $(target)-g++ # and also as either g++ (if native) or $(tooldir)/bin/g++. c++.install-common: - -if [ -f cc1plus ] ; then \ - if [ -f g++-cross ] ; then \ - rm -f $(bindir)/$(GXX_CROSS_NAME); \ - $(INSTALL_PROGRAM) g++-cross $(bindir)/$(GXX_CROSS_NAME); \ - chmod a+x $(bindir)/$(GXX_CROSS_NAME); \ - rm -f $(bindir)/$(CXX_CROSS_NAME); \ - ln $(bindir)/$(GXX_CROSS_NAME) $(bindir)/$(CXX_CROSS_NAME); \ + -if [ -f cc1plus$(exeext) ] ; then \ + if [ -f g++-cross$(exeext) ] ; then \ + rm -f $(bindir)/$(GXX_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) g++-cross$(exeext) $(bindir)/$(GXX_CROSS_NAME)$(exeext); \ + chmod a+x $(bindir)/$(GXX_CROSS_NAME)$(exeext); \ + rm -f $(bindir)/$(CXX_CROSS_NAME)$(exeext); \ + ln $(bindir)/$(GXX_CROSS_NAME)$(exeext) $(bindir)/$(CXX_CROSS_NAME)$(exeext) \ + > /dev/null 2>&1 \ + || cp $(bindir)/$(GXX_CROSS_NAME)$(exeext) $(bindir)/$(CXX_CROSS_NAME)$(exeext) ; \ else \ - rm -f $(bindir)/$(GXX_INSTALL_NAME); \ - $(INSTALL_PROGRAM) g++ $(bindir)/$(GXX_INSTALL_NAME); \ - chmod a+x $(bindir)/$(GXX_INSTALL_NAME); \ - rm -f $(bindir)/$(CXX_INSTALL_NAME); \ - ln $(bindir)/$(GXX_INSTALL_NAME) $(bindir)/$(CXX_INSTALL_NAME); \ + rm -f $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) g++$(exeext) $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ + chmod a+x $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ + rm -f $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \ + ln $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) \ + > /dev/null 2>&1 \ + || cp $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) ; \ fi ; \ fi c++.install-info: c++.install-man: $(srcdir)/cp/g++.1 - -if [ -f cc1plus ] ; then \ - $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/g++$(manext) ; \ - chmod a-x $(mandir)/g++$(manext) ; \ + -if [ -f cc1plus$(exeext) ] ; then \ + if [ -f g++-cross$(exeext) ] ; then \ + rm -f $(mandir)/$(GXX_CROSS_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/$(GXX_CROSS_NAME)$(manext); \ + chmod a-x $(mandir)/$(GXX_CROSS_NAME)$(manext); \ + else \ + rm -f $(mandir)/$(GXX_INSTALL_NAME)$(manext); \ + $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(mandir)/$(GXX_INSTALL_NAME)$(manext); \ + chmod a-x $(mandir)/$(GXX_INSTALL_NAME)$(manext); \ + fi; \ else true; fi c++.uninstall: - -rm -rf $(bindir)/$(CXX_INSTALL_NAME) - -rm -rf $(bindir)/$(CXX_CROSS_NAME) - -rm -rf $(bindir)/$(GXX_INSTALL_NAME) - -rm -rf $(bindir)/$(GXX_CROSS_NAME) - -rm -rf $(mandir)/g++$(manext) + -rm -rf $(bindir)/$(CXX_INSTALL_NAME)$(exeext) + -rm -rf $(bindir)/$(CXX_CROSS_NAME)$(exeext) + -rm -rf $(bindir)/$(GXX_INSTALL_NAME)$(exeext) + -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext) + -rm -rf $(mandir)/$(GXX_INSTALL_NAME)$(manext) + -rm -rf $(mandir)/$(GXX_CROSS_NAME)$(manext) # Clean hooks: # A lot of the ancillary files are deleted by the main makefile. # We just have to delete files specific to us. c++.mostlyclean: - -rm -f cp/*.o + -rm -f cp/*$(objext) $(DEMANGLER_PROG) c++.clean: c++.distclean: -rm -f cp/config.status cp/Makefile -rm -f cp/parse.output c++.extraclean: -c++.realclean: +c++.maintainer-clean: -rm -f cp/parse.c cp/parse.h # Stage hooks: # The main makefile has already created stage?/cp. c++.stage1: - -mv cp/*.o stage1/cp + -mv cp/*$(objext) stage1/cp c++.stage2: - -mv cp/*.o stage2/cp + -mv cp/*$(objext) stage2/cp c++.stage3: - -mv cp/*.o stage3/cp + -mv cp/*$(objext) stage3/cp c++.stage4: - -mv cp/*.o stage4/cp + -mv cp/*$(objext) stage4/cp # Maintenance hooks: