From 1110793abe7dca4b2092e69da0d5356eb4b25c77 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 4 Jul 2014 15:06:40 +0930 Subject: [PATCH] Update "configure.in" in comments and doco bfd/ * Makefile.am: Update "configure.in" comments. * PORTING: Likewise. * aoutx.h: Likewise. * configure.host: Likewise. * doc/bfdint.texi: Likewise. * targets.c: Likewise. * warning.m4: Likewise. * Makefile.in: Regenerate. gas/ * doc/internals.texi: Update "configure.in" comments. * acinclude.m4: Likewise. * config/tc-sparc.c: Likewise. ld/ * configure.ac: Update "configure.in" comments. * configure: Regenerate. --- bfd/ChangeLog | 11 +++++++++++ bfd/Makefile.am | 2 +- bfd/Makefile.in | 2 +- bfd/PORTING | 4 ++-- bfd/aoutx.h | 2 +- bfd/configure.host | 2 +- bfd/doc/bfdint.texi | 2 +- bfd/targets.c | 2 +- bfd/warning.m4 | 2 +- gas/ChangeLog | 6 ++++++ gas/acinclude.m4 | 2 +- gas/config/tc-sparc.c | 2 +- gas/doc/internals.texi | 2 +- ld/ChangeLog | 5 +++++ ld/configure | 2 +- ld/configure.ac | 2 +- 16 files changed, 36 insertions(+), 14 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 16511f2e045..014944fe608 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2014-07-04 Alan Modra + + * Makefile.am: Update "configure.in" comments. + * PORTING: Likewise. + * aoutx.h: Likewise. + * configure.host: Likewise. + * doc/bfdint.texi: Likewise. + * targets.c: Likewise. + * warning.m4: Likewise. + * Makefile.in: Regenerate. + 2014-07-04 Alan Modra * configure.ac: Rename from configure.in. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 3c59c878cb3..6f64f062973 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -739,7 +739,7 @@ CONFIG_STATUS_DEPENDENCIES = \ $(srcdir)/configure.host \ $(srcdir)/development.sh -# These are defined by configure.in: +# These are defined by configure: WORDSIZE = @wordsize@ ALL_BACKENDS = @all_backends@ BFD_BACKENDS = @bfd_backends@ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 4c589b69d2f..2c385d57424 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1044,7 +1044,7 @@ CONFIG_STATUS_DEPENDENCIES = \ $(srcdir)/development.sh -# These are defined by configure.in: +# These are defined by configure: WORDSIZE = @wordsize@ ALL_BACKENDS = @all_backends@ BFD_BACKENDS = @bfd_backends@ diff --git a/bfd/PORTING b/bfd/PORTING index 37e2c870670..f4786b31fbd 100644 --- a/bfd/PORTING +++ b/bfd/PORTING @@ -19,7 +19,7 @@ You need to create .c and config/.mt, and add a case for it to a case statements in bfd/configure.host and bfd/config.bfd, which associates each canonical host type with a BFD host type (used as the base of the makefile fragment names), and to the -table in bfd/configure.in which associates each target vector with +table in bfd/configure.ac which associates each target vector with the .o files it uses. config/.mt is a Makefile fragment. @@ -29,7 +29,7 @@ SELECT_ARCHITECTURES=bfd__arch See the list of cpu types in archures.c, or "ls cpu-*.c". If your architecture is new, you need to add it to the tables -in bfd/archures.c, opcodes/configure.in, and binutils/objdump.c. +in bfd/archures.c, opcodes/configure.ac, and binutils/objdump.c. For more information about .mt and .mh files, see config/README. diff --git a/bfd/aoutx.h b/bfd/aoutx.h index a2f7d1667b6..259c2bfe6ee 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -101,7 +101,7 @@ DESCRIPTION | TDEFAULTS = -DDEFAULT_VECTOR=host_aout_big_vec | TDEPFILES= host-aout.o trad-core.o - in the @file{config/@var{XXX}.mt} file, and modify @file{configure.in} + in the @file{config/@var{XXX}.mt} file, and modify @file{configure.ac} to use the @file{@var{XXX}.mt} file (by setting "<>") when your configuration is selected. */ diff --git a/bfd/configure.host b/bfd/configure.host index e796b6a5549..5942e575a1b 100644 --- a/bfd/configure.host +++ b/bfd/configure.host @@ -20,7 +20,7 @@ # Since the "bfd/hosts" directory is shared by the bfd, opcodes, and # binutils directories (at least), the index to it is also shared. -# This is that index. Each configure.in file should source this file +# This is that index. Each configure.ac file should source this file # in its per-host part. # This sets the following shell variables: diff --git a/bfd/doc/bfdint.texi b/bfd/doc/bfdint.texi index a138b0eb199..5e335c8eb2f 100644 --- a/bfd/doc/bfdint.texi +++ b/bfd/doc/bfdint.texi @@ -1548,7 +1548,7 @@ following: Define either @samp{TARGET_BIG_SYM} or @samp{TARGET_LITTLE_SYM}, or both, to a unique C name to use for the target vector. This name should appear in the list of target vectors in @file{targets.c}, and will also -have to appear in @file{config.bfd} and @file{configure.in}. Define +have to appear in @file{config.bfd} and @file{configure.ac}. Define @samp{TARGET_BIG_SYM} for a big-endian processor, @samp{TARGET_LITTLE_SYM} for a little-endian processor, and define both for a bi-endian processor. diff --git a/bfd/targets.c b/bfd/targets.c index 65f4648c59c..83131d1cfde 100644 --- a/bfd/targets.c +++ b/bfd/targets.c @@ -930,7 +930,7 @@ static const bfd_target * const _bfd_target_vector[] = #endif /* This list is alphabetized to make it easy to compare with other vector lists -- the decls above and - the case statement in configure.in. + the case statement in configure.ac. Try to keep it in order when adding new targets, and use a name of the form ____vec. Note that sorting is done as if __vec wasn't present. diff --git a/bfd/warning.m4 b/bfd/warning.m4 index b1a8c7b5a37..de7e9e4491b 100644 --- a/bfd/warning.m4 +++ b/bfd/warning.m4 @@ -1,4 +1,4 @@ -dnl Common configure.in fragment +dnl Common configure.ac fragment dnl dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. dnl diff --git a/gas/ChangeLog b/gas/ChangeLog index 96307e86c44..f2f25f2d3a6 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2014-07-04 Alan Modra + + * doc/internals.texi: Update "configure.in" comments. + * acinclude.m4: Likewise. + * config/tc-sparc.c: Likewise. + 2014-07-04 Alan Modra * configure.ac: Rename from configure.in. diff --git a/gas/acinclude.m4 b/gas/acinclude.m4 index 40722c6888a..9864abe23eb 100644 --- a/gas/acinclude.m4 +++ b/gas/acinclude.m4 @@ -37,7 +37,7 @@ test $gas_cv_assert_ok = yes || AC_DEFINE(BROKEN_ASSERT, 1, [assert broken?]) ])dnl dnl dnl Since many Bourne shell implementations lack subroutines, use this -dnl hack to simplify the code in configure.in. +dnl hack to simplify the code in configure.ac. dnl GAS_UNIQ(listvar) AC_DEFUN([GAS_UNIQ], [_gas_uniq_list="[$]$1" diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c index 5b0baad975a..b5e9704d286 100644 --- a/gas/config/tc-sparc.c +++ b/gas/config/tc-sparc.c @@ -262,7 +262,7 @@ static struct sparc_arch { { "v9d", "v9b", v9, 0, 1, HWCAP_MUL32|HWCAP_DIV32|HWCAP_FSMULD|HWCAP_POPC|HWCAP_VIS|HWCAP_VIS2|HWCAP_ASI_BLK_INIT|HWCAP_FMAF|HWCAP_VIS3|HWCAP_HPC }, { "v9e", "v9b", v9, 0, 1, HWCAP_MUL32|HWCAP_DIV32|HWCAP_FSMULD|HWCAP_POPC|HWCAP_VIS|HWCAP_VIS2|HWCAP_ASI_BLK_INIT|HWCAP_FMAF|HWCAP_VIS3|HWCAP_HPC|HWCAP_AES|HWCAP_DES|HWCAP_KASUMI|HWCAP_CAMELLIA|HWCAP_MD5|HWCAP_SHA1|HWCAP_SHA256|HWCAP_SHA512|HWCAP_MPMUL|HWCAP_MONT|HWCAP_CRC32C|HWCAP_CBCOND|HWCAP_PAUSE }, { "v9v", "v9b", v9, 0, 1, HWCAP_MUL32|HWCAP_DIV32|HWCAP_FSMULD|HWCAP_POPC|HWCAP_VIS|HWCAP_VIS2|HWCAP_ASI_BLK_INIT|HWCAP_FMAF|HWCAP_VIS3|HWCAP_HPC|HWCAP_RANDOM|HWCAP_TRANS|HWCAP_FJFMAU|HWCAP_IMA|HWCAP_ASI_CACHE_SPARING|HWCAP_AES|HWCAP_DES|HWCAP_KASUMI|HWCAP_CAMELLIA|HWCAP_MD5|HWCAP_SHA1|HWCAP_SHA256|HWCAP_SHA512|HWCAP_MPMUL|HWCAP_MONT|HWCAP_CRC32C|HWCAP_CBCOND|HWCAP_PAUSE }, - /* This exists to allow configure.in/Makefile.in to pass one + /* This exists to allow configure.tgt to pass one value to specify both the default machine and default word size. */ { "v9-64", "v9", v9, 64, 0, HWCAP_MUL32|HWCAP_DIV32|HWCAP_FSMULD|HWCAP_POPC }, { NULL, NULL, v8, 0, 0, 0 } diff --git a/gas/doc/internals.texi b/gas/doc/internals.texi index 76f812da03c..cc4089bcfb3 100644 --- a/gas/doc/internals.texi +++ b/gas/doc/internals.texi @@ -730,7 +730,7 @@ all the fixups (@code{fixup_segment}), resolves all the symbol values (using @cindex porting Each GAS target specifies two main things: the CPU file and the object format -file. Two main switches in the @file{configure.in} file handle this. The +file. Two main switches in the @file{configure.ac} file handle this. The first switches on CPU type to set the shell variable @code{cpu_type}. The second switches on the entire target to set the shell variable @code{fmt}. diff --git a/ld/ChangeLog b/ld/ChangeLog index aa3cb10e43d..20e5bb445f5 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2014-07-04 Alan Modra + + * configure.ac: Update "configure.in" comments. + * configure: Regenerate. + 2014-07-04 Alan Modra * configure.ac: Rename from configure.in. diff --git a/ld/configure b/ld/configure index 7a899be1ace..03fb75b3384 100755 --- a/ld/configure +++ b/ld/configure @@ -16846,7 +16846,7 @@ all_libpath= rm -f tdirs # If the host is 64-bit, then we enable 64-bit targets by default. -# This is consistent with what ../bfd/configure.in does. +# This is consistent with what ../bfd/configure.ac does. if test x${want64} = xfalse; then # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects diff --git a/ld/configure.ac b/ld/configure.ac index d1bf1e48dd4..c81ccfe014e 100644 --- a/ld/configure.ac +++ b/ld/configure.ac @@ -282,7 +282,7 @@ dnl file. rm -f tdirs # If the host is 64-bit, then we enable 64-bit targets by default. -# This is consistent with what ../bfd/configure.in does. +# This is consistent with what ../bfd/configure.ac does. if test x${want64} = xfalse; then AC_CHECK_SIZEOF(void *) if test "x${ac_cv_sizeof_void_p}" = "x8"; then -- 2.30.2