Makefile.in: Replace HOST_PREFIX...

* gcc/Makefile.in: Replace HOST_PREFIX, HOST_PREFIX_1 with
BUILD_PREFIX, BUILD_PREFIX_1, to correct nomenclature.
* gcc/mklibgcc.in: Likewise.
* gcc/config/arc/t-arc: Likewise.
* gcc/configure.in: Likewise.
* gcc/configure: Regenerate.

From-SVN: r54118

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 508cb9a58f93feac41087bb848b646bbbbdde5af..5882f22fc33ee35e190b9231428cf4fa7c22840b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-31  Nathanael Nerode  <neroden@twcny.rr.com>
+
+       * gcc/Makefile.in: Replace HOST_PREFIX, HOST_PREFIX_1 with 
+       BUILD_PREFIX, BUILD_PREFIX_1, to correct nomenclature.
+       * gcc/mklibgcc.in: Likewise.
+       * gcc/config/arc/t-arc: Likewise.
+       * gcc/configure.in: Likewise.
+       * gcc/configure: Regenerate.
+
 2002-05-31  Stan Shebs  <shebs@apple.com>
            Turly O'Connor  <turly@apple.com>
 

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 1f71654a5123b693751ce0193957e7f4eef0fe1c..4743a074d9ebc5a1b52f4b74f0ad2d581965743f 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -468,12 +468,12 @@ DIR = ../gcc
 # Flags to use when cross-building GCC.
 # Prefix to apply to names of object files when using them
 # to run on the machine we are compiling on.
-HOST_PREFIX = @HOST_PREFIX@
+BUILD_PREFIX = @BUILD_PREFIX@
 # Prefix to apply to names of object files when compiling them
 # to run on the machine we are compiling on.
 # The default for this variable is chosen to keep these rules
 # out of the way of the other rules for compiling the same source files.
-HOST_PREFIX_1 = @HOST_PREFIX_1@
+BUILD_PREFIX_1 = @BUILD_PREFIX_1@
 # Native compiler for the build machine and its switches.
 HOST_CC = @HOST_CC@
 HOST_CFLAGS= @HOST_CFLAGS@ -DGENERATOR_FILE
@@ -623,12 +623,12 @@ SYSLIBS = @GNAT_LIBEXC@
 # even if we are cross-building GCC.
 HOST_LIBS = $(BUILD_LIBIBERTY)
 
-HOST_RTL = $(HOST_PREFIX)rtl.o read-rtl.o $(HOST_PREFIX)bitmap.o \
-               $(HOST_PREFIX)ggc-none.o gensupport.o
+HOST_RTL = $(BUILD_PREFIX)rtl.o read-rtl.o $(BUILD_PREFIX)bitmap.o \
+               $(BUILD_PREFIX)ggc-none.o gensupport.o
 
-HOST_PRINT = $(HOST_PREFIX)print-rtl.o
-HOST_ERRORS = $(HOST_PREFIX)errors.o
-HOST_VARRAY = $(HOST_PREFIX)varray.o
+HOST_PRINT = $(BUILD_PREFIX)print-rtl.o
+HOST_ERRORS = $(BUILD_PREFIX)errors.o
+HOST_VARRAY = $(BUILD_PREFIX)varray.o
 
 # Specify the directories to be searched for header files.
 # Both . and srcdir are used, in that order,
@@ -1034,7 +1034,7 @@ LIBGCC_DEPS = $(GCC_PASSES) $(LANGUAGES) stmp-int-hdrs $(STMP_FIXPROTO) \
 
 libgcc.a: $(LIBGCC_DEPS)
        $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
-         HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
+         BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
          AR_FOR_TARGET="$(AR_FOR_TARGET)" \
          AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
          AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
@@ -1072,7 +1072,7 @@ s-mlib: $(srcdir)/genmultilib Makefile
 # Build multiple copies of libgcc.a, one for each target switch.
 stmp-multilib: $(LIBGCC_DEPS)
        $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
-         HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
+         BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
          AR_FOR_TARGET="$(AR_FOR_TARGET)" \
          AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
          AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
@@ -1928,43 +1928,43 @@ genpreds.o : genpreds.c $(RTL_BASE_H) $(HCONFIG_H) $(SYSTEM_H)
 #\f
 # Compile the libraries to be used by gen*.
 # If we are not cross-building, gen* use the same .o's that cc1 will use,
-# and HOST_PREFIX_1 is `loser-', just to ensure these rules don't conflict
+# and BUILD_PREFIX_1 is `loser-', just to ensure these rules don't conflict
 # with the rules for rtl.o, etc.
-$(HOST_PREFIX_1)rtl.o: $(srcdir)/rtl.c $(HCONFIG_H) $(SYSTEM_H) $(RTL_H) \
+$(BUILD_PREFIX_1)rtl.o: $(srcdir)/rtl.c $(HCONFIG_H) $(SYSTEM_H) $(RTL_H) \
   real.h $(GGC_H) errors.h
-       rm -f $(HOST_PREFIX)rtl.c
-       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/rtl.c > $(HOST_PREFIX)rtl.c
-       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)rtl.c $(OUTPUT_OPTION)
+       rm -f $(BUILD_PREFIX)rtl.c
+       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/rtl.c > $(BUILD_PREFIX)rtl.c
+       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)rtl.c $(OUTPUT_OPTION)
 
-$(HOST_PREFIX_1)print-rtl.o: $(srcdir)/print-rtl.c $(HCONFIG_H) \
+$(BUILD_PREFIX_1)print-rtl.o: $(srcdir)/print-rtl.c $(HCONFIG_H) \
   $(RTL_H) $(TREE_H) hard-reg-set.h $(BASIC_BLOCK_H)
-       rm -f $(HOST_PREFIX)print-rtl.c
-       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/print-rtl.c > $(HOST_PREFIX)print-rtl.c
-       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)print-rtl.c $(OUTPUT_OPTION)
+       rm -f $(BUILD_PREFIX)print-rtl.c
+       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/print-rtl.c > $(BUILD_PREFIX)print-rtl.c
+       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)print-rtl.c $(OUTPUT_OPTION)
 
-$(HOST_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(HCONFIG_H) $(SYSTEM_H) $(RTL_H) \
+$(BUILD_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(HCONFIG_H) $(SYSTEM_H) $(RTL_H) \
   flags.h $(BASIC_BLOCK_H) $(REGS_H)
-       rm -f $(HOST_PREFIX)bitmap.c
-       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/bitmap.c > $(HOST_PREFIX)bitmap.c
-       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)bitmap.c $(OUTPUT_OPTION)
+       rm -f $(BUILD_PREFIX)bitmap.c
+       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/bitmap.c > $(BUILD_PREFIX)bitmap.c
+       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)bitmap.c $(OUTPUT_OPTION)
 
-$(HOST_PREFIX_1)errors.o: errors.c $(HCONFIG_H) $(SYSTEM_H) errors.h
-       rm -f $(HOST_PREFIX)errors.c
-       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/errors.c > $(HOST_PREFIX)errors.c
-       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)errors.c $(OUTPUT_OPTION)
+$(BUILD_PREFIX_1)errors.o: errors.c $(HCONFIG_H) $(SYSTEM_H) errors.h
+       rm -f $(BUILD_PREFIX)errors.c
+       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/errors.c > $(BUILD_PREFIX)errors.c
+       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)errors.c $(OUTPUT_OPTION)
 
-$(HOST_PREFIX_1)varray.o: varray.c $(HCONFIG_H) $(SYSTEM_H) varray.h $(RTL_H) \
+$(BUILD_PREFIX_1)varray.o: varray.c $(HCONFIG_H) $(SYSTEM_H) varray.h $(RTL_H) \
   $(TREE_H) bitmap.h errors.h
-       rm -f $(HOST_PREFIX)varray.c
+       rm -f $(BUILD_PREFIX)varray.c
        sed -e 's/config[.]h/hconfig.h/' $(srcdir)/varray.c > \
-               $(HOST_PREFIX)varray.c
+               $(BUILD_PREFIX)varray.c
        $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
-               $(HOST_PREFIX)varray.c $(OUTPUT_OPTION)
+               $(BUILD_PREFIX)varray.c $(OUTPUT_OPTION)
 
-$(HOST_PREFIX_1)ggc-none.o: ggc-none.c $(HCONFIG_H) $(SYSTEM_H) $(GCC_H)
-       rm -f $(HOST_PREFIX)ggc-none.c
-       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/ggc-none.c > $(HOST_PREFIX)ggc-none.c
-       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)ggc-none.c $(OUTPUT_OPTION)
+$(BUILD_PREFIX_1)ggc-none.o: ggc-none.c $(HCONFIG_H) $(SYSTEM_H) $(GCC_H)
+       rm -f $(BUILD_PREFIX)ggc-none.c
+       sed -e 's/config[.]h/hconfig.h/' $(srcdir)/ggc-none.c > $(BUILD_PREFIX)ggc-none.c
+       $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)ggc-none.c $(OUTPUT_OPTION)
 
 #\f
 # Remake internationalization support.
@@ -2446,9 +2446,9 @@ mostlyclean: $(INTL_MOSTLYCLEAN) lang.mostlyclean
        -rm -f $(STAGESTUFF)
        -rm -rf libgcc
 # Delete the temporary source copies for cross compilation.
-       -rm -f $(HOST_PREFIX_1)rtl.c $(HOST_PREFIX_1)print-rtl.c
-       -rm -f $(HOST_PREFIX_1)bitmap.c $(HOST_PREFIX_1)errors.c
-       -rm -f $(HOST_PREFIX_1)ggc-none.c
+       -rm -f $(BUILD_PREFIX_1)rtl.c $(BUILD_PREFIX_1)print-rtl.c
+       -rm -f $(BUILD_PREFIX_1)bitmap.c $(BUILD_PREFIX_1)errors.c
+       -rm -f $(BUILD_PREFIX_1)ggc-none.c
 # Delete the temp files made in the course of building libgcc.a.
        -rm -f xlimits.h
 # Delete other built files.
@@ -2754,7 +2754,7 @@ install-libgcc: libgcc.mk libgcc.a installdirs
          r_f_t=: ; \
        fi; \
        $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
-         HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
+         BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
          AR_FOR_TARGET="$(AR_FOR_TARGET)" \
          AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
          AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
@@ -2780,7 +2780,7 @@ install-multilib: stmp-multilib installdirs
          r_f_t=: ; \
        fi; \
        $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
-         HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
+         BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
          AR_FOR_TARGET="$(AR_FOR_TARGET)" \
          AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
          AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \

diff --git a/gcc/config/arc/t-arc b/gcc/config/arc/t-arc
index 34c8dd48e86df01b372659e4339ef2c785c69ee9..688603b5d312795952f5ddcf9b17b1b54d69aa58 100644 (file)
--- a/gcc/config/arc/t-arc
+++ b/gcc/config/arc/t-arc
@@ -51,7 +51,7 @@ stmp-multilib-arc: stmp-multilib
          flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
          $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
            CC="$(CC)" CFLAGS="$(CFLAGS)" \
-           HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
+           BUILD_PREFIX="$(BUILD_PREFIX)" BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
            GCC_CFLAGS="$(GCC_CFLAGS) $${flags}" \
            INCLUDES="$(INCLUDES)" CRTSTUFF_T_CFLAGS=$(CRTSTUFF_T_CFLAGS) \
            dir="$${dir}" x-crtinit.o x-crtfini.o; \

diff --git a/gcc/configure b/gcc/configure
index cffcb4f9d7e05eb85fd8b0f800028d156b3ed5e4..5defdaa0a03eaee59fa94a5e6155aa3fda405ded 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -6797,8 +6797,8 @@ fi
 # FIXME.
 
 # These are the normal (build=host) settings:
-HOST_PREFIX=                   
-HOST_PREFIX_1=ignore-          
+BUILD_PREFIX=                  
+BUILD_PREFIX_1=ignore-         
 HOST_CC='$(CC)'                        
 HOST_CFLAGS='$(ALL_CFLAGS)'    
 
@@ -6808,8 +6808,8 @@ STMP_FIXPROTO=stmp-fixproto
 # And these apply if build != host.
 if test x$build != x$host
 then
-    HOST_PREFIX=build-
-    HOST_PREFIX_1=build-
+    BUILD_PREFIX=build-
+    BUILD_PREFIX_1=build-
     HOST_CC='$(CC_FOR_BUILD)'
     HOST_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
 
@@ -8543,8 +8543,8 @@ s%@CROSS@%$CROSS%g
 s%@ALL@%$ALL%g
 s%@SYSTEM_HEADER_DIR@%$SYSTEM_HEADER_DIR%g
 s%@inhibit_libc@%$inhibit_libc%g
-s%@HOST_PREFIX@%$HOST_PREFIX%g
-s%@HOST_PREFIX_1@%$HOST_PREFIX_1%g
+s%@BUILD_PREFIX@%$BUILD_PREFIX%g
+s%@BUILD_PREFIX_1@%$BUILD_PREFIX_1%g
 s%@HOST_CC@%$HOST_CC%g
 s%@HOST_CFLAGS@%$HOST_CFLAGS%g
 s%@STMP_FIXINC@%$STMP_FIXINC%g

diff --git a/gcc/configure.in b/gcc/configure.in
index e300363de24a4e4eb3dce0a28116fdd3553ef382..a76dac824f00eaee962d0d84cca63a8b3b33f9c8 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1146,8 +1146,8 @@ AC_SUBST(inhibit_libc)
 # FIXME.
 
 # These are the normal (build=host) settings:
-HOST_PREFIX=                   AC_SUBST(HOST_PREFIX)
-HOST_PREFIX_1=ignore-          AC_SUBST(HOST_PREFIX_1)
+BUILD_PREFIX=                  AC_SUBST(BUILD_PREFIX)
+BUILD_PREFIX_1=ignore-         AC_SUBST(BUILD_PREFIX_1)
 HOST_CC='$(CC)'                        AC_SUBST(HOST_CC)
 HOST_CFLAGS='$(ALL_CFLAGS)'    AC_SUBST(HOST_CFLAGS)
 
@@ -1157,8 +1157,8 @@ STMP_FIXPROTO=stmp-fixproto       AC_SUBST(STMP_FIXPROTO)
 # And these apply if build != host.
 if test x$build != x$host
 then
-    HOST_PREFIX=build-
-    HOST_PREFIX_1=build-
+    BUILD_PREFIX=build-
+    BUILD_PREFIX_1=build-
     HOST_CC='$(CC_FOR_BUILD)'
     HOST_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
 

diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index c5db6f0a03939eb512fb1563715992c8bb78861d..12f54460a6f0f840017080289cb83fd5ea01ee16 100644 (file)
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -56,8 +56,8 @@ make_compile='$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
          AR_EXTRACT_FOR_TARGET="$(AR_EXTRACT_FOR_TARGET)" \
          AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
          CC="$(CC)" CFLAGS="$(CFLAGS)" \
-         HOST_PREFIX="$(HOST_PREFIX)" \
-         HOST_PREFIX_1="$(HOST_PREFIX_1)" \
+         BUILD_PREFIX="$(BUILD_PREFIX)" \
+         BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
          LANGUAGES="$(LANGUAGES)"'
 
 # Dependencies for libgcc2.c