diff options
Diffstat (limited to 'gcc/cp/Make-lang.in')
| -rw-r--r-- | gcc/cp/Make-lang.in | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index d174691e54e..42656e7933d 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -40,17 +40,12 @@ # Actual names to use when installing a native compiler. CXX_INSTALL_NAME = `echo c++|sed '$(program_transform_name)'` GXX_INSTALL_NAME = `echo g++|sed '$(program_transform_name)'` -DEMANGLER_INSTALL_NAME = `echo c++filt|sed '$(program_transform_name)'` CXX_TARGET_INSTALL_NAME = $(target_alias)-`echo c++|sed '$(program_transform_name)'` GXX_TARGET_INSTALL_NAME = $(target_alias)-`echo g++|sed '$(program_transform_name)'` # Actual names to use when installing a cross-compiler. CXX_CROSS_NAME = `echo c++|sed '$(program_transform_cross_name)'` GXX_CROSS_NAME = `echo g++|sed '$(program_transform_cross_name)'` -DEMANGLER_CROSS_NAME = `echo c++filt|sed '$(program_transform_cross_name)'` - -# The name to use for the demangler program. -DEMANGLER_PROG = c++filt$(exeext) # # Define the names for selecting c++ in LANGUAGES. @@ -81,18 +76,6 @@ g++-cross$(exeext): g++$(exeext) -rm -f g++-cross$(exeext) cp g++$(exeext) g++-cross$(exeext) -# The demangler. -cxxmain.o: $(srcdir)/../libiberty/cplus-dem.c $(DEMANGLE_H) $(CONFIG_H) - rm -f cxxmain.c - $(LN_S) $(srcdir)/../libiberty/cplus-dem.c cxxmain.c - $(CC) -c -DMAIN $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DVERSION=\"$(version)\" cxxmain.c - -# Apparently OpenVM needs the -o to be at the beginning of the link line. -$(DEMANGLER_PROG): cxxmain.o underscore.o $(LIBDEPS) - $(CC) -o $@ $(ALL_CFLAGS) $(LDFLAGS) \ - cxxmain.o underscore.o $(LIBS) - # The compiler itself. # Shared with C front end: CXX_C_OBJS = attribs.o c-common.o c-format.o c-pragma.o c-semantics.o c-lex.o \ @@ -139,9 +122,9 @@ gt-cp-tree.h : s-gtype; @true # Build hooks: c++.all.build: g++$(exeext) -c++.all.cross: g++-cross$(exeext) $(DEMANGLER_PROG) +c++.all.cross: g++-cross$(exeext) c++.start.encap: g++$(exeext) -c++.rest.encap: $(DEMANGLER_PROG) +c++.rest.encap: c++.info: c++.dvi: @@ -181,17 +164,6 @@ c++.install-common: installdirs rm -f $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \ $(LN) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \ fi ; \ - if [ x$(DEMANGLER_PROG) != x ] && [ -x "$(DEMANGLER_PROG)" ]; then \ - if [ -f g++-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \ - chmod a+x $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext); \ - else \ - rm -f $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(DEMANGLER_PROG) $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \ - chmod a+x $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext); \ - fi ; \ - fi ; \ fi c++.install-info: @@ -214,8 +186,6 @@ c++.uninstall: -rm -rf $(bindir)/$(CXX_CROSS_NAME)$(exeext) -rm -rf $(bindir)/$(GXX_INSTALL_NAME)$(exeext) -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext) - -rm -rf $(bindir)/$(DEMANGLER_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(DEMANGLER_CROSS_NAME)$(exeext) -rm -rf $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext) -rm -rf $(man1dir)/$(GXX_CROSS_NAME)$(man1ext) # @@ -224,7 +194,7 @@ c++.uninstall: # We just have to delete files specific to us. c++.mostlyclean: - -rm -f cp/*$(objext) $(DEMANGLER_PROG) + -rm -f cp/*$(objext) -rm -f cp/*$(coverageexts) c++.clean: c++.distclean: @@ -276,11 +246,11 @@ cp/friend.o: cp/friend.c $(CXX_TREE_H) flags.h $(RTL_H) toplev.h $(EXPR_H) cp/init.o: cp/init.c $(CXX_TREE_H) flags.h $(RTL_H) $(EXPR_H) toplev.h \ $(GGC_H) except.h cp/method.o: cp/method.c $(CXX_TREE_H) toplev.h $(GGC_H) $(RTL_H) $(EXPR_H) \ - $(TM_P_H) + $(TM_P_H) $(TARGET_H) cp/cvt.o: cp/cvt.c $(CXX_TREE_H) cp/decl.h flags.h toplev.h convert.h cp/search.o: cp/search.c $(CXX_TREE_H) stack.h flags.h toplev.h $(RTL_H) cp/tree.o: cp/tree.c $(CXX_TREE_H) flags.h toplev.h $(GGC_H) $(RTL_H) \ - insn-config.h integrate.h tree-inline.h real.h gt-cp-tree.h + insn-config.h integrate.h tree-inline.h real.h gt-cp-tree.h $(TARGET_H) cp/ptree.o: cp/ptree.c $(CXX_TREE_H) $(SYSTEM_H) cp/rtti.o: cp/rtti.c $(CXX_TREE_H) flags.h toplev.h cp/except.o: cp/except.c $(CXX_TREE_H) flags.h $(RTL_H) except.h toplev.h \ |