diff options
author | Jeff Law <law@gcc.gnu.org> | 2015-07-24 12:20:44 -0600 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 2015-07-24 12:20:44 -0600 |
commit | 6b1786aa65f71d94362d38ada4bf96b6841a59cb (patch) | |
tree | 96bb0ed7351cd7b40e9303e38db7d0fc7f3aa2cf /gcc | |
parent | 525a825bc6fedc3a5d0c5311098ad55e830e8ac6 (diff) | |
download | gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.zip gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.tar.gz gcc-6b1786aa65f71d94362d38ada4bf96b6841a59cb.tar.bz2 |
re PR other/66259 (Combined gcc and binutils build from git-master fails, with gas/as-new not existing)
PR other/66259
* config-ml.in: Reflects renaming of configure.in to configure.ac
* configure: Likewise
* configure.ac: Likewise
boehm-gc/
PR other/66259
* Makefile.direct: Reflects renaming of configure.in to configure.ac
* Makefile.dist: Likewise
* version.h: Likewise
* doc/README: Likewise
config/
PR other/66259
* gettext.m4: Reflects renaming of configure.in to configure.ac
* po.m4: Likewise
* stdint.m4: Likewise
* tcl.m4: Likewise
gcc/
PR other/66259
* acinclude.m4: Reflects renaming of configure.in to configure.ac
* configure: Likewise
* configure.ac: Likewise
* doc/install.texi: Likewise
* doc/tm.texi: Likewise
* doc/tm.texi.in: Likewise
gcc/ada/
PR other/66259
* prj-nmsc.adb: Reflects renaming of configure.in to configure.ac
* gcc-interface/Makefile.in: Likewise
intl/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
libjava/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
libjava/classpath
PR other/66259
* INSTALL: Reflects renaming of configure.in to configure.ac
* ltconfig: Likewise
* missing: Likewise
* m4/ac_prog_javac.m4: Likewise
* m4/ac_prog/javac_works.m4: Likewise
* resource/META-INF/mimetypes.default: Likewise
libjava/libltdl
PR other/66259
* THREADS: Reflects renaming of configure.in to configure.ac
liboffloadmic/
PR other/66259
* configure: Reflects renaming of configure.in to configure.ac
From-SVN: r226183
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 10 | ||||
-rw-r--r-- | gcc/acinclude.m4 | 2 | ||||
-rw-r--r-- | gcc/ada/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 2 | ||||
-rw-r--r-- | gcc/ada/prj-nmsc.adb | 2 | ||||
-rwxr-xr-x | gcc/configure | 14 | ||||
-rw-r--r-- | gcc/configure.ac | 12 | ||||
-rw-r--r-- | gcc/doc/install.texi | 2 | ||||
-rw-r--r-- | gcc/doc/tm.texi | 2 | ||||
-rw-r--r-- | gcc/doc/tm.texi.in | 2 |
10 files changed, 35 insertions, 19 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5a85963..0bf256a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2015-07-24 Michael Darling <darlingm@gmail.com> + + PR other/66259 + * acinclude.m4: Reflects renaming of configure.in to configure.ac + * configure: Likewise + * configure.ac: Likewise + * doc/install.texi: Likewise + * doc/tm.texi: Likewise + * doc/tm.texi.in: Likewise + 2015-07-24 Kyrylo Tkachov <kyrylo.tkachov@arm.com> * alias.c (nonoverlapping_memrefs_p): Use std::swap instead of diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index 94da88e..0bcd844 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -390,7 +390,7 @@ AC_DEFUN([_gcc_COMPUTE_GAS_VERSION], [gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd for f in $gcc_cv_as_bfd_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure \ - $gcc_cv_as_gas_srcdir/configure.in \ + $gcc_cv_as_gas_srcdir/configure.ac \ $gcc_cv_as_gas_srcdir/Makefile.in ; do gcc_cv_gas_version=`sed -n -e 's/^[[ ]]*VERSION=[[^0-9A-Za-z_]]*\([[0-9]]*\.[[0-9]]*.*\)/VERSION=\1/p' < $f` if test x$gcc_cv_gas_version != x; then diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 73ec8de..60a7e69 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2015-07-24 Micahel Darling <darlingm@gmail.com> + + PR other/66259 + * prj-nmsc.adb: Reflects renaming of configure.in to configure.ac + * gcc-interface/Makefile.in: Likewise + 2015-07-12 Aldy Hernandez <aldyh@redhat.com> * gcc-interface/utils.c: Fix double word typos. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 6e24fa5..1d03f86 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -148,7 +148,7 @@ GCC_CFLAGS = $(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS) # We don't use cross-make. Instead we use the tools from the build tree, # if they are available. -# program_transform_name and objdir are set by configure.in. +# program_transform_name and objdir are set by configure.ac. program_transform_name = objdir = . diff --git a/gcc/ada/prj-nmsc.adb b/gcc/ada/prj-nmsc.adb index c7a5d3c..6c9db46 100644 --- a/gcc/ada/prj-nmsc.adb +++ b/gcc/ada/prj-nmsc.adb @@ -580,7 +580,7 @@ package body Prj.Nmsc is Canonical_Case_File_Name (Suf); -- The file name must end with the suffix (which is not an extension) - -- For instance a suffix "configure.in" must match a file with the + -- For instance a suffix "configure.ac" must match a file with the -- same name. To avoid dummy cases, though, a suffix starting with -- '.' requires a file that is at least one character longer ('.cpp' -- should not match a file with the same name). diff --git a/gcc/configure b/gcc/configure index 08bce32..dac5b07 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21681,7 +21681,7 @@ else if test -x "$DEFAULT_ASSEMBLER"; then gcc_cv_as="$DEFAULT_ASSEMBLER" -elif test -f $gcc_cv_as_gas_srcdir/configure.in \ +elif test -f $gcc_cv_as_gas_srcdir/configure.ac \ && test -f ../gas/Makefile \ && test x$build = x$host; then gcc_cv_as=../gas/as-new$build_exeext @@ -21754,7 +21754,7 @@ $as_echo "newly built gas" >&6; } gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd for f in $gcc_cv_as_bfd_srcdir/configure \ $gcc_cv_as_gas_srcdir/configure \ - $gcc_cv_as_gas_srcdir/configure.in \ + $gcc_cv_as_gas_srcdir/configure.ac \ $gcc_cv_as_gas_srcdir/Makefile.in ; do gcc_cv_gas_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f` if test x$gcc_cv_gas_version != x; then @@ -21844,7 +21844,7 @@ elif test $install_gold_as_default = yes \ && test -f ../gold/Makefile \ && test x$build = x$host; then gcc_cv_ld=../gold/ld-new$build_exeext -elif test -f $gcc_cv_ld_gld_srcdir/configure.in \ +elif test -f $gcc_cv_ld_gld_srcdir/configure.ac \ && test -f ../ld/Makefile \ && test x$build = x$host; then gcc_cv_ld=../ld/ld-new$build_exeext @@ -21960,7 +21960,7 @@ $as_echo "newly built ld" >&6; } elif test "$ld_is_gold" = yes; then in_tree_ld_is_elf=yes fi - for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in + for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.ac $gcc_cv_ld_gld_srcdir/Makefile.in do gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f` if test x$gcc_cv_gld_version != x; then @@ -21993,7 +21993,7 @@ if test "${gcc_cv_nm+set}" = set; then : else -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then gcc_cv_nm=../binutils/nm-new$build_exeext @@ -22072,7 +22072,7 @@ if test "${gcc_cv_objdump+set}" = set; then : else -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. @@ -22144,7 +22144,7 @@ if test "${gcc_cv_readelf+set}" = set; then : else -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. diff --git a/gcc/configure.ac b/gcc/configure.ac index 326bb59..3359f10 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2091,7 +2091,7 @@ m4_pattern_allow([AS_FOR_TARGET])dnl AS_VAR_SET_IF(gcc_cv_as,, [ if test -x "$DEFAULT_ASSEMBLER"; then gcc_cv_as="$DEFAULT_ASSEMBLER" -elif test -f $gcc_cv_as_gas_srcdir/configure.in \ +elif test -f $gcc_cv_as_gas_srcdir/configure.ac \ && test -f ../gas/Makefile \ && test x$build = x$host; then gcc_cv_as=../gas/as-new$build_exeext @@ -2180,7 +2180,7 @@ elif test $install_gold_as_default = yes \ && test -f ../gold/Makefile \ && test x$build = x$host; then gcc_cv_ld=../gold/ld-new$build_exeext -elif test -f $gcc_cv_ld_gld_srcdir/configure.in \ +elif test -f $gcc_cv_ld_gld_srcdir/configure.ac \ && test -f ../ld/Makefile \ && test x$build = x$host; then gcc_cv_ld=../ld/ld-new$build_exeext @@ -2244,7 +2244,7 @@ if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext \ elif test "$ld_is_gold" = yes; then in_tree_ld_is_elf=yes fi - for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in $gcc_cv_ld_gld_srcdir/Makefile.in + for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.ac $gcc_cv_ld_gld_srcdir/Makefile.in do changequote(,)dnl gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f` @@ -2277,7 +2277,7 @@ AC_SUBST(ORIGINAL_LD_GOLD_FOR_TARGET) # Figure out what nm we will be using. gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils AS_VAR_SET_IF(gcc_cv_nm,, [ -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then gcc_cv_nm=../binutils/nm-new$build_exeext @@ -2309,7 +2309,7 @@ esac # Figure out what objdump we will be using. AS_VAR_SET_IF(gcc_cv_objdump,, [ -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. @@ -2334,7 +2334,7 @@ fi # Figure out what readelf we will be using. AS_VAR_SET_IF(gcc_cv_readelf,, [ -if test -f $gcc_cv_binutils_srcdir/configure.in \ +if test -f $gcc_cv_binutils_srcdir/configure.ac \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 212008a..772ff19 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -2108,7 +2108,7 @@ machine. In general, if the Java front end is enabled, the GCJ libraries will be enabled too, unless they're known to not work on the target platform. If GCJ is enabled but @samp{libgcj} isn't built, you may need to port it; in this case, before modifying the top-level -@file{configure.in} so that @samp{libgcj} is enabled by default on this platform, +@file{configure.ac} so that @samp{libgcj} is enabled by default on this platform, you may use @option{--enable-libgcj} to override the default. @end table diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index b911b7d..f95646c 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -412,7 +412,7 @@ If defined, this macro is an additional prefix to try after @code{STANDARD_EXEC_PREFIX}. @code{MD_EXEC_PREFIX} is not searched when the compiler is built as a cross compiler. If you define @code{MD_EXEC_PREFIX}, then be sure to add it -to the list of directories used to find the assembler in @file{configure.in}. +to the list of directories used to find the assembler in @file{configure.ac}. @end defmac @defmac STANDARD_STARTFILE_PREFIX diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in index 47550cc..2383fb9 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in @@ -410,7 +410,7 @@ If defined, this macro is an additional prefix to try after @code{STANDARD_EXEC_PREFIX}. @code{MD_EXEC_PREFIX} is not searched when the compiler is built as a cross compiler. If you define @code{MD_EXEC_PREFIX}, then be sure to add it -to the list of directories used to find the assembler in @file{configure.in}. +to the list of directories used to find the assembler in @file{configure.ac}. @end defmac @defmac STANDARD_STARTFILE_PREFIX |