gcc/

2003-12-05  Kelley Cook  <kcook@gcc.gnu.org>

	* Makefile.in (program_transform_cross_name): Delete.
	(GCC_CROSS_NAME, CPP_CROSS_NAME): Delete.
	(PROTOIZE_CROSS_NAME, UNPROTOIZE_CROSS_NAME): Delete.
	(AR_FOR_TARGET, RANLIB_FOR_TARGET, NM_FOR_TARGET): Adjust for above.
	(install_cpp, install_driver, install-man, uninstall): Likewise.

gcc/cp
2003-12-05  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (GXX_CROSS_NAME, CXX_CROSS_NAME): Delete.
	(c++.install_common, cp/g++.1, c++.install-man): Adjust for above.
	(c++.uninstall): Likewise.

gcc/f
2003-12-05  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (G77_CROSS_NAME): Delete.
	(g77.install_common, g77.install-man, g77.uninstall): Adjust for above.

gcc/java
2003-12-05  Kelley Cook  <kcook@gcc.gnu.org>

	* Make-lang.in (GCJ_CROSS_NAME): Delete.
	(java.install_common, java.install-man): Adjust for above.
	(java.uninstall): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@74365 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0cf45b6..67e19d8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Makefile.in (program_transform_cross_name): Delete.
+       (GCC_CROSS_NAME, CPP_CROSS_NAME): Delete.
+       (PROTOIZE_CROSS_NAME, UNPROTOIZE_CROSS_NAME): Delete.
+       (AR_FOR_TARGET, RANLIB_FOR_TARGET, NM_FOR_TARGET): Adjust for above.
+       (install_cpp, install_driver, install-man, uninstall): Likewise.
+
 2003-12-06  Alan Modra  <amodra@bigpond.net.au>
 
        PR 13169

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 2a91343..00ba39c 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -63,7 +63,6 @@ target_noncanonical=@target_noncanonical@
 
 # Sed command to transform gcc to installed name.
 program_transform_name = @program_transform_name@
-program_transform_cross_name = @program_transform_name@
 
 # -----------------------------
 # Directories used during build
@@ -301,7 +300,7 @@ AR_FOR_TARGET = ` \
     if [ "$(host)" = "$(target)" ] ; then \
       echo ar; \
     else \
-       t='$(program_transform_cross_name)'; echo ar | sed -e $$t ; \
+       t='$(program_transform_name)'; echo ar | sed -e $$t ; \
     fi; \
   fi`
 AR_FLAGS_FOR_TARGET =
@@ -314,7 +313,7 @@ RANLIB_FOR_TARGET = ` \
     if [ "$(host)" = "$(target)" ] ; then \
       echo $(RANLIB); \
     else \
-       t='$(program_transform_cross_name)'; echo ranlib | sed -e $$t ; \
+       t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
     fi; \
   fi`
 NM_FOR_TARGET = ` \
@@ -326,7 +325,7 @@ NM_FOR_TARGET = ` \
     if [ "$(host)" = "$(target)" ] ; then \
       echo nm; \
     else \
-       t='$(program_transform_cross_name)'; echo nm | sed -e $$t ; \
+       t='$(program_transform_name)'; echo nm | sed -e $$t ; \
     fi; \
   fi`
 
@@ -602,12 +601,6 @@ UNPROTOIZE_INSTALL_NAME = `echo unprotoize|sed '$(program_transform_name)'`
 GCOV_INSTALL_NAME = `echo gcov|sed '$(program_transform_name)'`
 GCCBUG_INSTALL_NAME = `echo gccbug|sed '$(program_transform_name)'`
 
-# Actual name to use when installing a cross-compiler.
-GCC_CROSS_NAME = `echo gcc|sed '$(program_transform_cross_name)'`
-CPP_CROSS_NAME = `echo cpp|sed '$(program_transform_cross_name)'`
-PROTOIZE_CROSS_NAME = `echo protoize|sed '$(program_transform_cross_name)'`
-UNPROTOIZE_CROSS_NAME = `echo unprotoize|sed '$(program_transform_cross_name)'`
-
 # Setup the testing framework, if you have one
 EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
             echo $${rootme}/../expect/expect ; \
@@ -2864,21 +2857,12 @@ install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \
 
 # Handle cpp installation.
 install-cpp: cpp$(exeext)
-       -if [ -f gcc-cross$(exeext) ] ; then \
-         rm -f $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext); \
-         $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext); \
-         if [ x$(cpp_install_dir) != x ]; then \
-           rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
-         else true; fi; \
-       else \
-         rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext); \
-         $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext); \
-         if [ x$(cpp_install_dir) != x ]; then \
-           rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
-         else true; fi; \
-       fi
+       -rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext)
+       -$(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext)
+       -if [ x$(cpp_install_dir) != x ]; then \
+         rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
+       else true; fi
 
 # Create the installation directories.
 # $(libdir)/gcc/include isn't currently searched by cpp.
@@ -2921,22 +2905,14 @@ install-common: native $(EXTRA_PARTS) lang.install-common installdirs
          chmod a-x $(DESTDIR)$(libsubdir)/specs; \
        fi
 # Install protoize if it was compiled.
-       -if [ -f protoize$(exeext) ]; \
-       then \
-           if [ -f gcc-cross$(exeext) ] ; then \
-               rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
-               $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \
-               rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
-               $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \
-           else \
-               rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
-               $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
-               rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
-               $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
-           fi ; \
-           rm -f $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
-           $(INSTALL_DATA) SYSCALLS.c.X $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
-           chmod a-x $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
+       -if [ -f protoize$(exeext) ]; then \
+         rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \
+         rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \
+         rm -f $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
+         $(INSTALL_DATA) SYSCALLS.c.X $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
+         chmod a-x $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \
        fi
 # Install gcov if it was compiled.
        -if [ -f gcov$(exeext) ]; \
@@ -2950,22 +2926,17 @@ install-common: native $(EXTRA_PARTS) lang.install-common installdirs
 # $(target_noncanonical)-gcc-$(version)
 # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc.
 install-driver: installdirs xgcc$(exeext)
+       -rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
+       -$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
+       -rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)
+       -( cd $(DESTDIR)$(bindir) && \
+          $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version) )
        -if [ -f gcc-cross$(exeext) ] ; then \
-         rm -f $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext); \
-         $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext); \
-         rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version); \
-         ( cd $(DESTDIR)$(bindir) && \
-           $(LN) $(GCC_CROSS_NAME)$(exeext) $(target_noncanonical)-gcc-$(version) ); \
          if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
            rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
            $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \
          else true; fi; \
        else \
-         rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext); \
-         $(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext); \
-         rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version); \
-         ( cd $(DESTDIR)$(bindir) && \
-           $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version) ); \
          rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \
          ( cd $(DESTDIR)$(bindir) && \
            $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-tmp$(exeext) && \
@@ -3001,15 +2972,9 @@ $(DESTDIR)$(infodir)/%.info: $(docobjdir)/%.info installdirs
 
 # Install the man pages.
 install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
-       -if [ -f gcc-cross$(exeext) ] ; then \
-         rm -f $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
-         $(INSTALL_DATA) $(docobjdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
-         chmod a-x $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \
-       else \
-         rm -f $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
-         $(INSTALL_DATA) $(docobjdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
-         chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
-       fi
+       -rm -f $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
+       -$(INSTALL_DATA) $(docobjdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
+       -chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
        -rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext)
        -$(INSTALL_DATA) $(docobjdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext)
        -chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext)
@@ -3140,20 +3105,14 @@ uninstall: lang.uninstall
        -rm -rf $(DESTDIR)$(libsubdir)
        -rm -rf $(DESTDIR)$(libexecsubdir)
        -rm -rf $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
-       -rm -rf $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext)
        -rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext)
-       -rm -f $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext)
        -if [ x$(cpp_install_dir) != x ]; then \
          rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \
-         rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \
        else true; fi
        -rm -rf $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext)
-       -rm -rf $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext)
        -rm -rf $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext)
-       -rm -rf $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext)
        -rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext)
        -rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
-       -rm -rf $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext)
        -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext)
        -rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext)
        -rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index adfdb7e..7127625 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in (GXX_CROSS_NAME, CXX_CROSS_NAME): Delete.
+       (c++.install_common, cp/g++.1, c++.install-man): Adjust for above.
+       (c++.uninstall): Likewise.
+
 2003-12-05  Danny Smith <dannysmith@gcc.gnu.org>
            Mark Mitchell  <mark@codesourcery.com>
 

diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index a0e4339..365ede0 100644 (file)
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -42,10 +42,6 @@ GXX_INSTALL_NAME = `echo g++|sed '$(program_transform_name)'`
 CXX_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo c++|sed '$(program_transform_name)'`
 GXX_TARGET_INSTALL_NAME = $(target_noncanonical)-`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)'`
-
 #\f
 # Define the names for selecting c++ in LANGUAGES.
 # Note that it would be nice to move the dependency on g++
@@ -133,14 +129,14 @@ c++.install-normal:
 # Install the driver program as $(target)-g++
 # and also as either g++ (if native) or $(tooldir)/bin/g++.
 c++.install-common: installdirs
+       -rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
+       -$(INSTALL_PROGRAM) g++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
+       -chmod a+x $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
+       -rm -f $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext)
+       -( cd $(DESTDIR)$(bindir) && \
+             $(LN) $(GXX_INSTALL_NAME)$(exeext) $(CXX_INSTALL_NAME)$(exeext) )
        -if [ -f cc1plus$(exeext) ] ; then \
          if [ -f g++-cross$(exeext) ] ; then \
-           rm -f $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) g++-cross$(exeext) $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext); \
-           rm -f $(DESTDIR)$(bindir)/$(CXX_CROSS_NAME)$(exeext); \
-           ( cd $(DESTDIR)$(bindir) && \
-             $(LN) $(GXX_CROSS_NAME)$(exeext) $(CXX_CROSS_NAME)$(exeext) ); \
            if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \
              rm -f $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \
              $(INSTALL_PROGRAM) g++-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \
@@ -149,12 +145,6 @@ c++.install-common: installdirs
                $(LN) g++$(exeext) c++$(exeext) ); \
            else true; fi; \
          else \
-           rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) g++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
-           rm -f $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
-           ( cd $(DESTDIR)$(bindir) && \
-             $(LN) $(GXX_INSTALL_NAME)$(exeext) $(CXX_INSTALL_NAME)$(exeext) ); \
            rm -f $(DESTDIR)$(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \
            ( cd $(DESTDIR)$(bindir) && \
              $(LN) $(GXX_INSTALL_NAME)$(exeext) $(GXX_TARGET_INSTALL_NAME)$(exeext) ); \
@@ -166,32 +156,19 @@ c++.install-common: installdirs
 
 cp/g++.1:
        -rm -f $@
-       if [ "$(ALL)" = all.cross ]; then \
-         echo ".so man1/$(GCC_CROSS_NAME).1" > $@ ; \
-       else \
-         echo ".so man1/$(GCC_INSTALL_NAME).1" > $@ ; \
-       fi
+       -echo ".so man1/$(GCC_INSTALL_NAME).1" > $@
 
 c++.install-man: installdirs cp/g++.1
        -if [ -f cc1plus$(exeext) ] ; then \
-         if [ -f g++-cross$(exeext) ] ; then \
-           rm -f $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
-           $(INSTALL_DATA) cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
-           chmod a-x $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \
-         else \
-           rm -f $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
-           $(INSTALL_DATA) cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
-           chmod a-x $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
-         fi; \
+         rm -f $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
+         $(INSTALL_DATA) cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
+         chmod a-x $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
        else true; fi
 
 c++.uninstall:
        -rm -rf $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext)
-       -rm -rf $(DESTDIR)$(bindir)/$(CXX_CROSS_NAME)$(exeext)
        -rm -rf $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext)
-       -rm -rf $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext)
        -rm -rf $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext)
-       -rm -rf $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext)
 #\f
 # Clean hooks:
 # A lot of the ancillary files are deleted by the main makefile.

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 07b6c21..99a666f 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in (G77_CROSS_NAME): Delete.
+       (g77.install_common, g77.install-man, g77.uninstall): Adjust for above.
+
 2003-11-30  Andreas Jaeger  <aj@suse.de>
 
        * Make-lang.in (f77.rebuilt): Fix dependency on g77.info.

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index eebbe48..b54b83c 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -40,9 +40,6 @@
 # Actual name to use when installing a native compiler.
 G77_INSTALL_NAME = `echo g77|sed '$(program_transform_name)'`
 
-# Actual name to use when installing a cross-compiler.
-G77_CROSS_NAME = `echo g77|sed '$(program_transform_cross_name)'`
-
 # Some versions of `touch' (such as the version on Solaris 2.8) 
 # do not correctly set the timestamp due to buggy versions of `utime'
 # in the kernel.  So, we use `echo' instead. 
@@ -252,15 +249,9 @@ f77.install-normal:
 # and also as either g77 (if native) or $(tooldir)/bin/g77.
 f77.install-common: installdirs
        -if [ -f f771$(exeext) ] ; then \
-         if [ -f g77-cross$(exeext) ] ; then \
-           rm -f $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) g77-cross$(exeext) $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \
-         else \
-           rm -f $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) g77$(exeext) $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
-         fi ; \
+         rm -f $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) g77$(exeext) $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
+         chmod a+x $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
        else true; fi
        @if [ -f f77-install-ok -o -f $(srcdir)/f77-install-ok ]; then \
          echo ''; \
@@ -276,15 +267,9 @@ install-info:: $(DESTDIR)$(infodir)/g77.info
 
 f77.install-man: $(GENERATED_MANPAGES) installdirs
        -if [ -f f771$(exeext) ] ; then \
-         if [ -f g77-cross$(exeext) ] ; then \
-           rm -f $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
-           $(INSTALL_DATA) $(docobjdir)/g77.1 $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
-           chmod a-x $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
-         else \
-           rm -f $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-           $(INSTALL_DATA) $(docobjdir)/g77.1 $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-           chmod a-x $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-         fi; \
+         rm -f $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
+         $(INSTALL_DATA) $(docobjdir)/g77.1 $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
+         chmod a-x $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
        else true; fi
 
 f77.uninstall: installdirs
@@ -293,9 +278,7 @@ f77.uninstall: installdirs
          install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \
        else : ; fi
        rm -rf $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \
-       rm -rf $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \
        rm -rf $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-       rm -rf $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \
        rm -rf $(DESTDIR)$(infodir)/g77.info*
 #\f
 # Clean hooks:

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 9a55a27..efb1fed 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-06  Kelley Cook  <kcook@gcc.gnu.org>
+
+       * Make-lang.in (GCJ_CROSS_NAME): Delete.
+       (java.install_common, java.install-man): Adjust for above.
+       (java.uninstall): Likewise.
+
 2003-12-03  Michael Koch  <konqueror@gmx.de>
 
        * class.c (make_class_data):

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index e7a5bae..fc6adf9 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -45,9 +45,6 @@ JAVA_INSTALL_NAME = `echo gcj|sed '$(program_transform_name)'`
 JAVA_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcj|sed '$(program_transform_name)'`
 GCJH_TARGET_INSTALL_NAME = $(target_noncanonical)-`echo gcjh|sed '$(program_transform_name)'`
 
-# Actual names to use when installing a cross-compiler.
-JAVA_CROSS_NAME = `echo gcj|sed '$(program_transform_cross_name)'`
-
 GCJ = gcj
 
 # Define the names for selecting java in LANGUAGES.
@@ -187,14 +184,12 @@ java.install-normal:
 # be explicitly prefixed) and native builds.
 java.install-common: installdirs
        -if [ -f $(GCJ)$(exeext) ]; then \
+         rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
+         $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
+         chmod a+x $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
          if [ -f $(GCJ)-cross$(exeext) ]; then \
-           rm -f $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) $(GCJ)-cross$(exeext) $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \
+           true; \
          else \
-           rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
-           $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
-           chmod a+x $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
            rm -f $(DESTDIR)$(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \
            ( cd $(DESTDIR)$(bindir) && \
              $(LN) $(JAVA_INSTALL_NAME)$(exeext) $(JAVA_TARGET_INSTALL_NAME)$(exeext) ); \
@@ -218,9 +213,7 @@ java.install-man:
 
 java.uninstall:
        -rm -rf $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext)
-       -rm -rf $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext)
        -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext)
-       -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext)
        -rm -rf $(DESTDIR)$(man1dir)/gcjh$(man1ext)
        -rm -rf $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
        -rm -rf $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
@@ -404,15 +397,9 @@ rmiregistry.pod: java/gcj.texi
 # Install the man pages.
 java.install-man: installdirs $(GENERATED_JAVA_MANPAGES)
        -if [ -f $(GCJ)$(exeext) ]; then \
-         if [ -f $(GCJ)-cross$(exeext) ]; then \
-           rm -f $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \
-           $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \
-           chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \
-         else \
-           rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
-           $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
-           chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
-         fi ; \
+         rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
+         $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
+         chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
        fi
        -rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext)
        -$(INSTALL_DATA) $(docobjdir)/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext)