Makefile.in, [...]: Replace "build_canonical" with build, "host_canonical" with host.

	* Makefile.in, configure.in, config/m68hc11/t-m68hc11-gas:
	Replace "build_canonical" with build, "host_canonical" with host.
	* configure.in: Use GCC_TOPLEV_SUBDIRS.
	* aclocal.m4: Include ../config/acx.m4.
	* configure: Regenerate.
(ada)
	* Makefile.in: Replace "host_canonical" with "host" for autoconf
	substitution.

From-SVN: r67691

gcc/ChangeLog

-2003-06-19  David Taylor  <dtaylor@emc.com>
+2003-06-09  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.in, configure.in, config/m68hc11/t-m68hc11-gas:
+	Replace "build_canonical" with build, "host_canonical" with host.
+	* configure.in: Use GCC_TOPLEV_SUBDIRS.
+	* aclocal.m4: Include ../config/acx.m4.
+	* configure: Regenerate.
+
+2003-06-09  David Taylor  <dtaylor@emc.com>
 
 	* config/rs6000/rs6000.c (rs6000_build_va_list): Give the two
 	bytes of padding in the __va_list_tag structure a name (reserved).
@@ -7,7 +15,7 @@
 
 	* fold-const.c (operand_equal_p): Handle ADDR_EXPR and TRUTH_NOT_EXPR.
 
-2003-06-19  Osku Salerma  <osku@iki.fi>
+2003-06-09  Osku Salerma  <osku@iki.fi>
 
 	* c-format.c (check_format_string, get_constant): New.
 	(handle_format_attribute, handle_format_arg_attribute,

gcc/Makefile.in

@@ -59,8 +59,8 @@ MAKEOVERRIDES =
 # Directory where sources are, from where we are.
 VPATH = @srcdir@
 
-build_canonical = @build_canonical@
-host_canonical = @host_canonical@
+build=@build@
+host=@host@
 target=@target@
 target_alias=@target_alias@
 
@@ -273,7 +273,7 @@ AR_FOR_TARGET = ` \
   if [ -f $(objdir)/../binutils/ar ] ; then \
     echo $(objdir)/../binutils/ar ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo ar; \
     else \
        t='$(program_transform_cross_name)'; echo ar | sed -e $$t ; \
@@ -286,7 +286,7 @@ RANLIB_FOR_TARGET = ` \
   if [ -f $(objdir)/../binutils/ranlib ] ; then \
     echo $(objdir)/../binutils/ranlib ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo $(RANLIB); \
     else \
        t='$(program_transform_cross_name)'; echo ranlib | sed -e $$t ; \
@@ -298,7 +298,7 @@ NM_FOR_TARGET = ` \
   elif [ -f $(objdir)/../binutils/nm-new ] ; then \
     echo $(objdir)/../binutils/nm-new ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo nm; \
     else \
        t='$(program_transform_cross_name)'; echo nm | sed -e $$t ; \
@@ -2519,7 +2519,7 @@ fixinc.sh: $(FIXINCSRCDIR)/mkfixinc.sh $(FIXINCSRCDIR)/fixincl.c \
 	WARN_CFLAGS="$(WARN_CFLAGS)"; LIBERTY=`pwd`/"$(BUILD_LIBIBERTY)"; \
 	export MAKE srcdir CC CFLAGS LDFLAGS WARN_CFLAGS LIBERTY; \
 	cd ./fixinc && \
-	$(SHELL) $${srcdir}/mkfixinc.sh $(build_canonical) $(target))
+	$(SHELL) $${srcdir}/mkfixinc.sh $(build) $(target))
 
 .PHONY: install-gcc-tooldir
 install-gcc-tooldir:
@@ -3246,8 +3246,8 @@ site.exp: ./config.status Makefile
 	@echo "# add them to the last section" >> ./tmp0
 	@echo "set rootme \"`${PWD}`\"" >> ./tmp0
 	@echo "set srcdir \"`cd ${srcdir}; ${PWD}`\"" >> ./tmp0
-	@echo "set host_triplet $(host_canonical)" >> ./tmp0
-	@echo "set build_triplet $(build_canonical)" >> ./tmp0
+	@echo "set host_triplet $(host)" >> ./tmp0
+	@echo "set build_triplet $(build)" >> ./tmp0
 	@echo "set target_triplet $(target)" >> ./tmp0
 	@echo "set target_alias $(target_alias)" >> ./tmp0
 # CFLAGS is set even though it's empty to show we reserve the right to set it.
@@ -3265,7 +3265,7 @@ site.exp: ./config.status Makefile
 # theoretically the -B won't be needed.
 # We also need to pass -L ../ld so that the linker can find ldscripts.
 	@if [ -d $(objdir)/../$(target_subdir)/newlib ] \
-	    && [ "${host_canonical}" != "${target}" ]; then \
+	    && [ "${host}" != "${target}" ]; then \
 	  echo "set newlib_cflags \"-I$(objdir)/../$(target_subdir)/newlib/targ-include -I\$$srcdir/../newlib/libc/include\"" >> ./tmp0; \
 	  echo "set newlib_ldflags \"-B$(objdir)/../$(target_subdir)/newlib/\"" >> ./tmp0; \
 	  echo "append CFLAGS \" \$$newlib_cflags\"" >> ./tmp0; \

gcc/aclocal.m4

+sinclude(../config/acx.m4)
 sinclude(../config/accross.m4)
 
 dnl See if stdbool.h properly defines bool and true/false.

gcc/ada/ChangeLog

+2003-06-09  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+	* Makefile.in: Replace "host_canonical" with "host" for autoconf
+	substitution.
+
 2003-06-08  Neil Booth  <neil@daikokuya.co.uk>
 
 	* Make-lang.in: Update.

gcc/ada/Makefile.in

@@ -179,7 +179,7 @@ target=@target@
 target_alias=@target_alias@
 xmake_file=@dep_host_xmake_file@
 tmake_file=@dep_tmake_file@
-host_canonical=@host_canonical@
+host_canonical=@host@
 #version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < $(srcdir)/version.c`
 #mainversion=`sed -e 's/.*\"\([0-9]*\.[0-9]*\).*/\1/' < $(srcdir)/version.c`
 

gcc/config/m68hc11/t-m68hc11-gas

@@ -2,7 +2,7 @@ RANLIB_FOR_TARGET = ` \
   if [ -f $(objdir)/../binutils/ranlib ] ; then \
     echo $(objdir)/../binutils/ranlib ; \
   else \
-    if [ "$(host_canonical)" = "$(target)" ] ; then \
+    if [ "$(host)" = "$(target)" ] ; then \
       echo ranlib; \
     else \
        if [ -f $(bindir)/$(target_alias)-ranlib ] ; then \

gcc/configure.in

@@ -32,15 +32,9 @@ AC_CONFIG_HEADER(auto-host.h:config.in)
 # Determine the host, build, and target systems
 AC_CANONICAL_SYSTEM
 
-# Define variables host_canonical and build_canonical
-build_canonical=${build}
-host_canonical=${host}
-AC_SUBST(build_canonical)
-AC_SUBST(host_canonical)
-
-target_subdir=${target_alias}
-AC_SUBST(target_subdir)
-	
+# Determine the target- and build-specific subdirectories
+GCC_TOPLEV_SUBDIRS
+
 # Set program_transform_name
 AC_ARG_PROGRAM
 
@@ -1168,7 +1162,7 @@ else
 	cd ..
 	rm -rf $tempdir
 	build_auto=auto-build.h
-	FORBUILD=../build-$build_alias
+	FORBUILD=../$(build_subdir)
 fi
 AC_SUBST(FORBUILD)