Patch to update top-level config to autoconf 2.59

Patch to update top-level config to autoconf 2.59

[Steve Ellcey]

Here is my final patch to update autoconf in the src tree.  All subtrees
have been updated to be configured by autoconf 2.59 and this patch
updates the top level configure and Makefiles to also use 2.59.  The
only real change needed was to rename AS_FOR_TARGET to GAS_FOR_TARGET.
I also changed COMPILER_AS_FOR_TARGET to COMPILER_GAS_FOR_TARGET, though
that wasn't strictly necessary, it just seemed like a good idea to
maintain the naming consistency.

Tested on IA64 HP-UX.  OK for checkin?

Steve Ellcey
sje@cup.hp.com



2006-08-10  Steve Ellcey  <sje@cup.hp.com>

	* configure.in: Fix for autoconf 2.59.
	* Makefile.tpl: Ditto.
	* Makefile.def: Ditto.
	* configure: Regenerate.
	* Makefile.in: Regenerate.

Index: configure.in
===================================================================
RCS file: /cvs/src/src/configure.in,v
retrieving revision 1.315
diff -c -r1.315 configure.in
*** configure.in	25 Jul 2006 08:39:57 -0000	1.315
--- configure.in	10 Aug 2006 18:22:10 -0000
***************
*** 21,27 ****
  sinclude(config/acx.m4)
  
  AC_INIT(move-if-change)
! AC_PREREQ(2.13)
  AC_CANONICAL_SYSTEM
  AC_ARG_PROGRAM
  
--- 21,27 ----
  sinclude(config/acx.m4)
  
  AC_INIT(move-if-change)
! AC_PREREQ(2.59)
  AC_CANONICAL_SYSTEM
  AC_ARG_PROGRAM
  
***************
*** 2296,2302 ****
  NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
  
  ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
! ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
  ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
  ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld)
  ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
--- 2296,2302 ----
  NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
  
  ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
! ACX_CHECK_INSTALLED_TARGET_TOOL(GAS_FOR_TARGET, as)
  ACX_CHECK_INSTALLED_TARGET_TOOL(DLLTOOL_FOR_TARGET, dlltool)
  ACX_CHECK_INSTALLED_TARGET_TOOL(LD_FOR_TARGET, ld)
  ACX_CHECK_INSTALLED_TARGET_TOOL(LIPO_FOR_TARGET, lipo)
***************
*** 2309,2315 ****
  RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
  
  GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar])
! GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new])
  GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
  GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
  		[gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
--- 2309,2315 ----
  RAW_CXX_FOR_TARGET="$CXX_FOR_TARGET"
  
  GCC_TARGET_TOOL(ar, AR_FOR_TARGET, AR, [binutils/ar])
! GCC_TARGET_TOOL(as, GAS_FOR_TARGET, AS, [gas/as-new])
  GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
  GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX,
  		[gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs],
***************
*** 2341,2360 ****
  
  # When building target libraries, except in a Canadian cross, we use
  # the same toolchain as the compiler we just built.
! COMPILER_AS_FOR_TARGET='$(AS_FOR_TARGET)'
  COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
  COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
  if test $host = $build; then
    case " $configdirs " in
      *" gcc "*)
!       COMPILER_AS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
        COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
        COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
        ;;
    esac
  fi
  
! AC_SUBST(COMPILER_AS_FOR_TARGET)
  AC_SUBST(COMPILER_LD_FOR_TARGET)
  AC_SUBST(COMPILER_NM_FOR_TARGET)
  
--- 2341,2360 ----
  
  # When building target libraries, except in a Canadian cross, we use
  # the same toolchain as the compiler we just built.
! COMPILER_GAS_FOR_TARGET='$(GAS_FOR_TARGET)'
  COMPILER_LD_FOR_TARGET='$(LD_FOR_TARGET)'
  COMPILER_NM_FOR_TARGET='$(NM_FOR_TARGET)'
  if test $host = $build; then
    case " $configdirs " in
      *" gcc "*)
!       COMPILER_GAS_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/as'
        COMPILER_LD_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/collect-ld'
        COMPILER_NM_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/nm'${extra_nmflags_for_target}
        ;;
    esac
  fi
  
! AC_SUBST(COMPILER_GAS_FOR_TARGET)
  AC_SUBST(COMPILER_LD_FOR_TARGET)
  AC_SUBST(COMPILER_NM_FOR_TARGET)
  
Index: Makefile.tpl
===================================================================
RCS file: /cvs/src/src/Makefile.tpl,v
retrieving revision 1.164
diff -c -r1.164 Makefile.tpl
*** Makefile.tpl	19 Jul 2006 17:06:06 -0000	1.164
--- Makefile.tpl	10 Aug 2006 18:22:10 -0000
***************
*** 158,164 ****
  	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
  	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
  	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
! 	AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \
  	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
  	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
  	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
--- 158,164 ----
  	OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
  	OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
  	AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \
! 	GAS_FOR_TARGET="$(GAS_FOR_TARGET)"; export GAS_FOR_TARGET; \
  	GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \
  	LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \
  	NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \
***************
*** 194,200 ****
  BASE_TARGET_EXPORTS = \
  	$(BASE_EXPORTS) \
  	AR="$(AR_FOR_TARGET)"; export AR; \
! 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
  	CC="$(CC_FOR_TARGET)"; export CC; \
  	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
--- 194,200 ----
  BASE_TARGET_EXPORTS = \
  	$(BASE_EXPORTS) \
  	AR="$(AR_FOR_TARGET)"; export AR; \
! 	AS="$(COMPILER_GAS_FOR_TARGET)"; export AS; \
  	CC="$(CC_FOR_TARGET)"; export CC; \
  	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
  	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
***************
*** 304,310 ****
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
  
  AR_FOR_TARGET=@AR_FOR_TARGET@
! AS_FOR_TARGET=@AS_FOR_TARGET@
  CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
  
  # If GCC_FOR_TARGET is not overriden on the command line, then this
--- 304,310 ----
  FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
  
  AR_FOR_TARGET=@AR_FOR_TARGET@
! GAS_FOR_TARGET=@GAS_FOR_TARGET@
  CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET)
  
  # If GCC_FOR_TARGET is not overriden on the command line, then this
***************
*** 326,332 ****
  STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
  WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
  
! COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@
  COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
  COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
  
--- 326,332 ----
  STRIP_FOR_TARGET=@STRIP_FOR_TARGET@
  WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
  
! COMPILER_GAS_FOR_TARGET=@COMPILER_GAS_FOR_TARGET@
  COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
  COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
  
***************
*** 434,440 ****
  # COMPILER_ prefixed variables are not passed down so we expand them here.
  EXTRA_TARGET_FLAGS = \
  	'AR=$$(AR_FOR_TARGET)' \
! 	'AS=$(COMPILER_AS_FOR_TARGET)' \
  	'CC=$$(CC_FOR_TARGET)' \
  	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
  	'CXX=$$(CXX_FOR_TARGET)' \
--- 434,440 ----
  # COMPILER_ prefixed variables are not passed down so we expand them here.
  EXTRA_TARGET_FLAGS = \
  	'AR=$$(AR_FOR_TARGET)' \
! 	'AS=$(COMPILER_GAS_FOR_TARGET)' \
  	'CC=$$(CC_FOR_TARGET)' \
  	'CFLAGS=$$(CFLAGS_FOR_TARGET)' \
  	'CXX=$$(CXX_FOR_TARGET)' \
Index: Makefile.def
===================================================================
RCS file: /cvs/src/src/Makefile.def,v
retrieving revision 1.70
diff -c -r1.70 Makefile.def
*** Makefile.def	17 Jul 2006 17:04:21 -0000	1.70
--- Makefile.def	10 Aug 2006 18:22:10 -0000
***************
*** 227,233 ****
  
  // Target tools
  flags_to_pass = { flag= AR_FOR_TARGET ; };
! flags_to_pass = { flag= AS_FOR_TARGET ; };
  flags_to_pass = { flag= CC_FOR_TARGET ; };
  flags_to_pass = { flag= CFLAGS_FOR_TARGET ; };
  flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; };
--- 227,233 ----
  
  // Target tools
  flags_to_pass = { flag= AR_FOR_TARGET ; };
! flags_to_pass = { flag= GAS_FOR_TARGET ; };
  flags_to_pass = { flag= CC_FOR_TARGET ; };
  flags_to_pass = { flag= CFLAGS_FOR_TARGET ; };
  flags_to_pass = { flag= CPPFLAGS_FOR_TARGET ; };

Re: Patch to update top-level config to autoconf 2.59

[Daniel Jacobowitz]

On Thu, Aug 10, 2006 at 01:08:00PM -0700, Steve Ellcey wrote:
> Here is my final patch to update autoconf in the src tree.  All subtrees
> have been updated to be configured by autoconf 2.59 and this patch
> updates the top level configure and Makefiles to also use 2.59.  The
> only real change needed was to rename AS_FOR_TARGET to GAS_FOR_TARGET.
> I also changed COMPILER_AS_FOR_TARGET to COMPILER_GAS_FOR_TARGET, though
> that wasn't strictly necessary, it just seemed like a good idea to
> maintain the naming consistency.

Why was the AS_FOR_TARGET change necessary?

> Tested on IA64 HP-UX.  OK for checkin?

The top level files are all shared with GCC; you'll really have to copy
this to gcc-patches, and I suspect they'll want you to wait until 4.2
branches.

-- 
Daniel Jacobowitz
CodeSourcery

Re: Patch to update top-level config to autoconf 2.59

[Daniel Jacobowitz]

Oops, left something out...

On Thu, Aug 10, 2006 at 04:29:57PM -0400, Daniel Jacobowitz wrote:
> On Thu, Aug 10, 2006 at 01:08:00PM -0700, Steve Ellcey wrote:
> > Here is my final patch to update autoconf in the src tree.

THANKS!

Your persistance in seeing this cleanup through to the end is truly
appreciated.

-- 
Daniel Jacobowitz
CodeSourcery

Re: Patch to update top-level config to autoconf 2.59

[Steve Ellcey]

> On Thu, Aug 10, 2006 at 01:08:00PM -0700, Steve Ellcey wrote:
> > Here is my final patch to update autoconf in the src tree.  All subtrees
> > have been updated to be configured by autoconf 2.59 and this patch
> > updates the top level configure and Makefiles to also use 2.59.  The
> > only real change needed was to rename AS_FOR_TARGET to GAS_FOR_TARGET.
> > I also changed COMPILER_AS_FOR_TARGET to COMPILER_GAS_FOR_TARGET, though
> > that wasn't strictly necessary, it just seemed like a good idea to
> > maintain the naming consistency.
> 
> Why was the AS_FOR_TARGET change necessary?

Because autoconf 2.59 gave an error if I didn't change the name.

| [hpsje] $ autoconf
| configure.in:2299: error: possibly undefined macro: AS_FOR_TARGET
|       If this token and others are legitimate, please use m4_pattern_allow.
|       See the Autoconf documentation.

It looked like the common fix for this was to rename it to
GAS_FOR_TARGET.  I see that all these files are shared, I didn't realise
that.  I thought that GCC was already configuring everything with 2.59
but I see they still use 2.13 for the toplevel configure and have the
same configure.in (and Makefiles) as the src tree.  Oh well.

> The top level files are all shared with GCC; you'll really have to copy
> this to gcc-patches, and I suspect they'll want you to wait until 4.2
> branches.

Yes, I expect so.  I guess this last bit will have to wait for a while.

Steve Ellcey
sje@cup.hp.com

Re: Patch to update top-level config to autoconf 2.59

[Daniel Jacobowitz]

On Thu, Aug 10, 2006 at 02:02:46PM -0700, Steve Ellcey wrote:
> > Why was the AS_FOR_TARGET change necessary?
> 
> Because autoconf 2.59 gave an error if I didn't change the name.
> 
> | [hpsje] $ autoconf
> | configure.in:2299: error: possibly undefined macro: AS_FOR_TARGET
> |       If this token and others are legitimate, please use m4_pattern_allow.
> |       See the Autoconf documentation.
> 
> It looked like the common fix for this was to rename it to
> GAS_FOR_TARGET.  I see that all these files are shared, I didn't realise
> that.  I thought that GCC was already configuring everything with 2.59
> but I see they still use 2.13 for the toplevel configure and have the
> same configure.in (and Makefiles) as the src tree.  Oh well.

The problem is that it doesn't necessarily have to be gas - it could be
the native assembler.  GCC has:

  m4_pattern_allow([AS_FOR_TARGET])dnl

So it's probably better (and a smaller patch) to just do that.

> Yes, I expect so.  I guess this last bit will have to wait for a while.

Hopefully, not much longer.

-- 
Daniel Jacobowitz
CodeSourcery

Re: Patch to update top-level config to autoconf 2.59

[Christopher Faylor]

On Thu, Aug 10, 2006 at 04:41:18PM -0400, Daniel Jacobowitz wrote:
>Oops, left something out...
>
>On Thu, Aug 10, 2006 at 04:29:57PM -0400, Daniel Jacobowitz wrote:
>>On Thu, Aug 10, 2006 at 01:08:00PM -0700, Steve Ellcey wrote:
>>>Here is my final patch to update autoconf in the src tree.
>
>THANKS!
>
>Your persistance in seeing this cleanup through to the end is truly
>appreciated.

I hate me-toos but it seems like one is called for here.

THANK YOU.

In addition to gdb and binutils, I appreciate that you got us off of our
butts in the Cygwin project and finally moved our configury into the
21st century.

cgf

Re: Patch to update top-level config to autoconf 2.59

[Paolo Bonzini]

> The problem is that it doesn't necessarily have to be gas - it could be
> the native assembler.  GCC has:
> 
>   m4_pattern_allow([AS_FOR_TARGET])dnl
> 
> So it's probably better (and a smaller patch) to just do that.

Yep.  Also, it would be best if you could test this change also on a 
cross-compiler, a Canadian cross, and maybe even a host-x-host (i.e. 
host != build, but build == target) configuration.  Be sure to use 
non-canonical names (i.e. names that config.sub will change).  :-)

Personally I would not be against this change even if it breaks some 
configurations, as long as it is known *which*.

Paolo

Re: Patch to update top-level config to autoconf 2.59

[Paolo Bonzini]

> Yep.  Also, it would be best if you could test this change also on a 
> cross-compiler, a Canadian cross, and maybe even a host-x-host (i.e. 
> host != build, but build == target) configuration.  Be sure to use 
> non-canonical names (i.e. names that config.sub will change).  :-)
> 
> Personally I would not be against this change even if it breaks some 
> configurations, as long as it is known *which*.

... and why.  (And as long as there are plans to fix them -- I had in 
mind especially the non-canonical names).

Paolo

Re: Patch to update top-level config to autoconf 2.59

[Ben Elliston]

> > Here is my final patch to update autoconf in the src tree.  All subtrees
> > have been updated to be configured by autoconf 2.59 and this patch
> > updates the top level configure and Makefiles to also use 2.59.  The
> > only real change needed was to rename AS_FOR_TARGET to GAS_FOR_TARGET.
> > I also changed COMPILER_AS_FOR_TARGET to COMPILER_GAS_FOR_TARGET, though
> > that wasn't strictly necessary, it just seemed like a good idea to
> > maintain the naming consistency.
> 
> Why was the AS_FOR_TARGET change necessary?

I wondered that, too.  I'm concerned that this is a user-visible
change that might break users and/or build scripts.  It's possible to
use other assemblers for assembling target code and we should not
preclude this (or hint at it by virtue of its name).

Ben