This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [patch] correct nomenclature: HOST_PREFIX to BUILD_PREFIX
On Thu, May 30, 2002 at 06:51:51PM -0400, DJ Delorie wrote:
> Wrong fix. The patch does not include changes for any toplevel files
> at all. It only changes files in the gcc subdirectory.
Can't imagine how I lost that part of the diff; here's the hopefully
correct & complete version. Thanks for catching my brain fade....
This starts to correct the usage of "HOST" to mean "BUILD" in gcc's
Makefiles and configure files, by changing all uses of HOST_PREFIX and
HOST_PREFIX_1. It's pure search and replace. Obviously there's a lot more
renaming to do (HOST_CC etc.), but this is big enough already by itself.
Tested on i686-pc-linux-gnu (again).
2002-05-14 Nathanael Nerode <neroden@twcny.rr.com>
* Makefile.in: Replace HOST_PREFIX, HOST_PREFIX_1 with BUILD_PREFIX,
BUILD_PREFIX_1, to correct nomenclature.
* configure: Replace HOST_PREFIX, HOST_PREFIX_1 with BUILD_PREFIX,
BUILD_PREFIX_1, to correct nomenclature.
* gcc/Makefile.in: Replace HOST_PREFIX, HOST_PREFIX_1 with
BUILD_PREFIX, BUILD_PREFIX_1, to correct nomenclature.
* gcc/configure.in: Replace HOST_PREFIX, HOST_PREFIX_1 with
BUILD_PREFIX, BUILD_PREFIX_1, to correct nomenclature.
* gcc/configure: Regenerate.
* gcc/mklibgcc.in: Replace HOST_PREFIX, HOST_PREFIX_1 with
BUILD_PREFIX, BUILD_PREFIX_1, to correct nomenclature.
* gcc/config/arc/t-arc: Replace HOST_PREFIX, HOST_PREFIX_1 with
BUILD_PREFIX, BUILD_PREFIX_1, to correct nomenclature.
Index: Makefile.in
===================================================================
RCS file: /cvsroot/gcc/gcc/Makefile.in,v
retrieving revision 1.100
diff -c -3 -r1.100 Makefile.in
*** Makefile.in 16 May 2002 17:41:52 -0000 1.100
--- Makefile.in 30 May 2002 23:17:15 -0000
***************
*** 90,97 ****
# Special variables passed down in EXTRA_GCC_FLAGS. They are defined
# here so that they can be overridden by Makefile fragments.
HOST_CC = $(CC_FOR_BUILD)
! HOST_PREFIX =
! HOST_PREFIX_1 = loser-
# These flag values are normally overridden by the configure script.
CFLAGS = -g
--- 90,97 ----
# Special variables passed down in EXTRA_GCC_FLAGS. They are defined
# here so that they can be overridden by Makefile fragments.
HOST_CC = $(CC_FOR_BUILD)
! BUILD_PREFIX =
! BUILD_PREFIX_1 = loser-
# These flag values are normally overridden by the configure script.
CFLAGS = -g
***************
*** 486,493 ****
'CXX=$(CXX)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'HOST_CC=$(CC_FOR_BUILD)' \
! 'HOST_PREFIX=$(HOST_PREFIX)' \
! 'HOST_PREFIX_1=$(HOST_PREFIX_1)' \
'NM=$(NM)' \
"`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
--- 486,493 ----
'CXX=$(CXX)' \
'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \
'HOST_CC=$(CC_FOR_BUILD)' \
! 'BUILD_PREFIX=$(BUILD_PREFIX)' \
! 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \
'NM=$(NM)' \
"`echo 'RANLIB=$(RANLIB)' | sed -e s/.*=$$/XFOO=/`" \
'WINDRES=$$(WINDRES_FOR_TARGET)' \
Index: configure
===================================================================
RCS file: /cvsroot/gcc/gcc/configure,v
retrieving revision 1.42
diff -c -3 -r1.42 configure
*** configure 16 May 2002 17:41:52 -0000 1.42
--- configure 30 May 2002 23:17:16 -0000
***************
*** 917,924 ****
tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD"
tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET GCJ_FOR_TARGET"
! tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET HOST_PREFIX"
! tools="${tools} HOST_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
tools="${tools} WINDRES WINDRES_FOR_TARGET YACC"
tools="${tools} OBJCOPY OBJDUMP"
--- 917,924 ----
tools="AR AR_FOR_TARGET AS AS_FOR_TARGET BISON CC_FOR_BUILD"
tools="${tools} CC_FOR_TARGET CXX_FOR_TARGET GCJ_FOR_TARGET"
! tools="${tools} DLLTOOL DLLTOOL_FOR_TARGET GCC_FOR_TARGET BUILD_PREFIX"
! tools="${tools} BUILD_PREFIX_1 LD LD_FOR_TARGET LEX MAKEINFO NM"
tools="${tools} NM_FOR_TARGET RANLIB RANLIB_FOR_TARGET"
tools="${tools} WINDRES WINDRES_FOR_TARGET YACC"
tools="${tools} OBJCOPY OBJDUMP"
***************
*** 955,962 ****
DLLTOOL=${DLLTOOL-${host_alias}-dlltool}
DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool}
GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
! HOST_PREFIX=${build_alias}-
! HOST_PREFIX_1=${build_alias}-
LD=${LD-${host_alias}-ld}
LD_FOR_TARGET=${LD_FOR_TARGET-${target_alias}-ld}
MAKEINFO=${MAKEINFO-makeinfo}
--- 955,962 ----
DLLTOOL=${DLLTOOL-${host_alias}-dlltool}
DLLTOOL_FOR_TARGET=${DLLTOOL_FOR_TARGET-${target_alias}-dlltool}
GCC_FOR_TARGET=${GCC_FOR_TARGET-${CC_FOR_TARGET-${target_alias}-gcc}}
! BUILD_PREFIX=${build_alias}-
! BUILD_PREFIX_1=${build_alias}-
LD=${LD-${host_alias}-ld}
LD_FOR_TARGET=${LD_FOR_TARGET-${target_alias}-ld}
MAKEINFO=${MAKEINFO-makeinfo}
Index: gcc/Makefile.in
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.882
diff -c -3 -r1.882 Makefile.in
*** gcc/Makefile.in 28 May 2002 17:32:04 -0000 1.882
--- gcc/Makefile.in 30 May 2002 23:17:21 -0000
***************
*** 468,479 ****
# 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@
# 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@
# Native compiler for the build machine and its switches.
HOST_CC = @HOST_CC@
HOST_CFLAGS= @HOST_CFLAGS@ -DGENERATOR_FILE
--- 468,479 ----
# 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.
! 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.
! 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,634 ****
# 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_PRINT = $(HOST_PREFIX)print-rtl.o
! HOST_ERRORS = $(HOST_PREFIX)errors.o
! HOST_VARRAY = $(HOST_PREFIX)varray.o
# Specify the directories to be searched for header files.
# Both . and srcdir are used, in that order,
--- 623,634 ----
# even if we are cross-building GCC.
HOST_LIBS = $(BUILD_LIBIBERTY)
! HOST_RTL = $(BUILD_PREFIX)rtl.o read-rtl.o $(BUILD_PREFIX)bitmap.o \
! $(BUILD_PREFIX)ggc-none.o gensupport.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,1040 ****
libgcc.a: $(LIBGCC_DEPS)
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
! HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
AR_FOR_TARGET="$(AR_FOR_TARGET)" \
AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
--- 1034,1040 ----
libgcc.a: $(LIBGCC_DEPS)
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
! 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,1078 ****
# 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)" \
AR_FOR_TARGET="$(AR_FOR_TARGET)" \
AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
--- 1072,1078 ----
# Build multiple copies of libgcc.a, one for each target switch.
stmp-multilib: $(LIBGCC_DEPS)
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
! 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,1970 ****
#
# 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
# with the rules for rtl.o, etc.
! $(HOST_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)
! $(HOST_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)
! $(HOST_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)
!
! $(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)
! $(HOST_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
sed -e 's/config[.]h/hconfig.h/' $(srcdir)/varray.c > \
! $(HOST_PREFIX)varray.c
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
! $(HOST_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)
#
# Remake internationalization support.
--- 1928,1970 ----
#
# 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 BUILD_PREFIX_1 is `loser-', just to ensure these rules don't conflict
# with the rules for rtl.o, etc.
! $(BUILD_PREFIX_1)rtl.o: $(srcdir)/rtl.c $(HCONFIG_H) $(SYSTEM_H) $(RTL_H) \
real.h $(GGC_H) errors.h
! 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)
! $(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 $(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)
! $(BUILD_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(HCONFIG_H) $(SYSTEM_H) $(RTL_H) \
flags.h $(BASIC_BLOCK_H) $(REGS_H)
! 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)
!
! $(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)
! $(BUILD_PREFIX_1)varray.o: varray.c $(HCONFIG_H) $(SYSTEM_H) varray.h $(RTL_H) \
$(TREE_H) bitmap.h errors.h
! rm -f $(BUILD_PREFIX)varray.c
sed -e 's/config[.]h/hconfig.h/' $(srcdir)/varray.c > \
! $(BUILD_PREFIX)varray.c
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
! $(BUILD_PREFIX)varray.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)
#
# Remake internationalization support.
***************
*** 2446,2454 ****
-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
# Delete the temp files made in the course of building libgcc.a.
-rm -f xlimits.h
# Delete other built files.
--- 2446,2454 ----
-rm -f $(STAGESTUFF)
-rm -rf libgcc
# Delete the temporary source copies for cross compilation.
! -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,2760 ****
r_f_t=: ; \
fi; \
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
! HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_PREFIX_1)" \
AR_FOR_TARGET="$(AR_FOR_TARGET)" \
AR_CREATE_FOR_TARGET="$(AR_CREATE_FOR_TARGET)" \
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
--- 2754,2760 ----
r_f_t=: ; \
fi; \
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
! 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,2786 ****
r_f_t=: ; \
fi; \
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
! HOST_PREFIX="$(HOST_PREFIX)" HOST_PREFIX_1="$(HOST_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,2786 ----
r_f_t=: ; \
fi; \
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
! 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)" \
Index: gcc/configure
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/configure,v
retrieving revision 1.607
diff -c -3 -r1.607 configure
*** gcc/configure 27 May 2002 04:24:45 -0000 1.607
--- gcc/configure 30 May 2002 23:17:28 -0000
***************
*** 6797,6804 ****
# FIXME.
# These are the normal (build=host) settings:
! HOST_PREFIX=
! HOST_PREFIX_1=ignore-
HOST_CC='$(CC)'
HOST_CFLAGS='$(ALL_CFLAGS)'
--- 6797,6804 ----
# FIXME.
# These are the normal (build=host) settings:
! BUILD_PREFIX=
! BUILD_PREFIX_1=ignore-
HOST_CC='$(CC)'
HOST_CFLAGS='$(ALL_CFLAGS)'
***************
*** 6808,6815 ****
# And these apply if build != host.
if test x$build != x$host
then
! HOST_PREFIX=build-
! HOST_PREFIX_1=build-
HOST_CC='$(CC_FOR_BUILD)'
HOST_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
--- 6808,6815 ----
# And these apply if build != host.
if test x$build != x$host
then
! BUILD_PREFIX=build-
! BUILD_PREFIX_1=build-
HOST_CC='$(CC_FOR_BUILD)'
HOST_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
***************
*** 8543,8550 ****
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%@HOST_CC@%$HOST_CC%g
s%@HOST_CFLAGS@%$HOST_CFLAGS%g
s%@STMP_FIXINC@%$STMP_FIXINC%g
--- 8543,8550 ----
s%@ALL@%$ALL%g
s%@SYSTEM_HEADER_DIR@%$SYSTEM_HEADER_DIR%g
s%@inhibit_libc@%$inhibit_libc%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
Index: gcc/configure.in
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/configure.in,v
retrieving revision 1.594
diff -c -3 -r1.594 configure.in
*** gcc/configure.in 27 May 2002 04:24:53 -0000 1.594
--- gcc/configure.in 30 May 2002 23:17:30 -0000
***************
*** 1146,1153 ****
# FIXME.
# These are the normal (build=host) settings:
! HOST_PREFIX= AC_SUBST(HOST_PREFIX)
! HOST_PREFIX_1=ignore- AC_SUBST(HOST_PREFIX_1)
HOST_CC='$(CC)' AC_SUBST(HOST_CC)
HOST_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(HOST_CFLAGS)
--- 1146,1153 ----
# FIXME.
# These are the normal (build=host) settings:
! 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,1164 ****
# And these apply if build != host.
if test x$build != x$host
then
! HOST_PREFIX=build-
! HOST_PREFIX_1=build-
HOST_CC='$(CC_FOR_BUILD)'
HOST_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
--- 1157,1164 ----
# And these apply if build != host.
if test x$build != x$host
then
! BUILD_PREFIX=build-
! BUILD_PREFIX_1=build-
HOST_CC='$(CC_FOR_BUILD)'
HOST_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD) $(XCFLAGS)'
Index: gcc/mklibgcc.in
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/mklibgcc.in,v
retrieving revision 1.46
diff -c -3 -r1.46 mklibgcc.in
*** gcc/mklibgcc.in 9 May 2002 21:09:26 -0000 1.46
--- gcc/mklibgcc.in 30 May 2002 23:17:31 -0000
***************
*** 56,63 ****
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)" \
LANGUAGES="$(LANGUAGES)"'
# Dependencies for libgcc2.c
--- 56,63 ----
AR_EXTRACT_FOR_TARGET="$(AR_EXTRACT_FOR_TARGET)" \
AR_FLAGS_FOR_TARGET="$(AR_FLAGS_FOR_TARGET)" \
CC="$(CC)" CFLAGS="$(CFLAGS)" \
! BUILD_PREFIX="$(BUILD_PREFIX)" \
! BUILD_PREFIX_1="$(BUILD_PREFIX_1)" \
LANGUAGES="$(LANGUAGES)"'
# Dependencies for libgcc2.c
Index: gcc/config/arc/t-arc
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/config/arc/t-arc,v
retrieving revision 1.4
diff -c -3 -r1.4 t-arc
*** gcc/config/arc/t-arc 17 May 2001 03:15:46 -0000 1.4
--- gcc/config/arc/t-arc 30 May 2002 23:17:33 -0000
***************
*** 51,57 ****
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)" \
GCC_CFLAGS="$(GCC_CFLAGS) $${flags}" \
INCLUDES="$(INCLUDES)" CRTSTUFF_T_CFLAGS=$(CRTSTUFF_T_CFLAGS) \
dir="$${dir}" x-crtinit.o x-crtfini.o; \
--- 51,57 ----
flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
$(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \
CC="$(CC)" CFLAGS="$(CFLAGS)" \
! 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; \