From 13b4a2bf1a3c92c0cbb7bd8738d8db5480ec4f06 Mon Sep 17 00:00:00 2001 From: Michael Darling Date: Thu, 16 Jul 2015 22:34:16 -0400 Subject: [PATCH] [7/14] Completes renaming of configure.in files to .ac Combined builds has been broken for about 10 months, because some binutils configure.in files were renamed to configure.ac, but gcc's references to them were not updated. Fixing gcc's references to them is much easier by renaming the few straggling configure.in files to configure.ac. gcc's configure.in files were entirely renamed to configure.ac some time ago. There are corresponding patches submitted to gcc, which updates all references to binutils-gdb configure.in files to configure.ac, which is what ultimately fixes combined builds. See PR binutils-gdb/binutils/18450 and gcc/other/66259. Signed-off by: Michael Darling --- gdb/ChangeLog | 7 +++++++ gdb/acinclude.m4 | 2 +- gdb/config/djgpp/fnchange.lst | 2 +- gdb/configure | 2 +- gdb/gdbserver/ChangeLog | 5 +++++ gdb/gdbserver/acinclude.m4 | 2 +- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/configure | 2 +- 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f4857e3..2454c43 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2015-07-16 Michael Darling + + PR binutils/18450 + * acinclude.m4: Reflects renaming of configure.in to configure.ac + * configure: Likewise + * config/djgpp/fnchange.lst: Likewise + 2015-07-16 Pierre Langlois * aarch64-tdep.c (aarch64_pseudo_read_value): Mark S register as diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 845e65f..fee11ff 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -12,7 +12,7 @@ sinclude(libmcheck.m4) # This gets GDB_AC_TRANSFORM. sinclude(transform.m4) -dnl gdb/configure.in uses BFD_NEED_DECLARATION, so get its definition. +dnl gdb/configure.ac uses BFD_NEED_DECLARATION, so get its definition. sinclude(../bfd/bfd.m4) dnl This gets the standard macros. diff --git a/gdb/config/djgpp/fnchange.lst b/gdb/config/djgpp/fnchange.lst index c05eb2c..e7a6a23 100644 --- a/gdb/config/djgpp/fnchange.lst +++ b/gdb/config/djgpp/fnchange.lst @@ -470,7 +470,7 @@ @V@/gdb/testsuite/gdb.gdbtk/c_variable.exp @V@/gdb/testsuite/gdb.tk/c_variable.exp @V@/gdb/testsuite/gdb.gdbtk/c_variable.test @V@/gdb/testsuite/gdb.tk/c_variable.test @V@/gdb/testsuite/gdb.gdbtk/configure @V@/gdb/testsuite/gdb.tk/configure -@V@/gdb/testsuite/gdb.gdbtk/configure.in @V@/gdb/testsuite/gdb.tk/configure.in +@V@/gdb/testsuite/gdb.gdbtk/configure.ac @V@/gdb/testsuite/gdb.tk/configure.ac @V@/gdb/testsuite/gdb.gdbtk/console.exp @V@/gdb/testsuite/gdb.tk/console.exp @V@/gdb/testsuite/gdb.gdbtk/console.test @V@/gdb/testsuite/gdb.tk/console.test @V@/gdb/testsuite/gdb.gdbtk/cpp_variable.cc @V@/gdb/testsuite/gdb.tk/cpp_variable.cc diff --git a/gdb/configure b/gdb/configure index e8979f0..99e1248 100755 --- a/gdb/configure +++ b/gdb/configure @@ -17602,7 +17602,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ac_sub_configure=$ac_srcdir/configure.gnu elif test -f "$ac_srcdir/configure"; then ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then + elif test -f "$ac_srcdir/configure.ac"; then # This should be Cygnus configure. ac_sub_configure=$ac_aux_dir/configure else diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 73cb392..39bee65 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,8 @@ +2015-07-16 Michael Darling + + PR binutils/18450 + * acinclude.m4: Reflects renaming of configure.in to configure.ac + 2015-07-15 Jan Kratochvil Revert the previous 3 commits: diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4 index 0b86c04..ca1aebf 100644 --- a/gdb/gdbserver/acinclude.m4 +++ b/gdb/gdbserver/acinclude.m4 @@ -1,4 +1,4 @@ -dnl gdb/gdbserver/configure.in uses BFD_HAVE_SYS_PROCFS_TYPE. +dnl gdb/gdbserver/configure.ac uses BFD_HAVE_SYS_PROCFS_TYPE. sinclude(../../bfd/bfd.m4) sinclude(../acx_configure_dir.m4) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 520f606..46125ab 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-07-16 Michael Darling + + PR binutils/18450 + * configure: Reflects renaming of configure.in to configure.ac + 2015-07-16 Jan Kratochvil * gdb.arch/i386-biarch-core.exp: Replace istarget diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure index 0853e48..967b009 100755 --- a/gdb/testsuite/configure +++ b/gdb/testsuite/configure @@ -4802,7 +4802,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ac_sub_configure=$ac_srcdir/configure.gnu elif test -f "$ac_srcdir/configure"; then ac_sub_configure=$ac_srcdir/configure - elif test -f "$ac_srcdir/configure.in"; then + elif test -f "$ac_srcdir/configure.ac"; then # This should be Cygnus configure. ac_sub_configure=$ac_aux_dir/configure else -- 2.4.4