Re: [PATCH] Fix PR bootstrap/42798

[Ralf Wildenhues <Ralf.Wildenhues@gmx.de>]

* Ralf Wildenhues wrote on Thu, Jun 03, 2010 at 08:33:22AM CEST:
> * Paolo Bonzini wrote on Wed, Jun 02, 2010 at 02:15:51PM CEST:
> > Yes, that's fine.  Just commit config/ changes to gcc and src first,
> > and everything else afterwards in a separate commit.
> 
> Committed to gcc and synced to src:
> (this patch causes minor trivial non-semantic changes in regenerated
> configure scripts which I will address in a followup.)

This is the followup patch for src.  Tested by building binutils+gdb,
I'm starting a combined tree with --enable-build-with-cxx now.
Ok to commit if no problems show up?

A note to the gold change: I've looked at git glibc headers, of the
declarations tested only 'basename' was overloaded.  If more are added
in the future, the configure.ac files need to be adjusted to give
parameters for them, too.  This applies to the whole tree of course for
--enable-build-with-cxx, not just for gold.

Thanks,
Ralf

bfd/ChangeLog:
2010-06-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure.in: Check for declaration of 'basename(char *)',
        * configure: Regenerate.
	* config.in: Regenerate.

binutils/ChangeLog:
2010-06-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

gas/ChangeLog:
2010-06-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

gold/ChangeLog:
2010-06-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure.ac: Remove AC_CHECK_DECLS done with the C compiler.
	With the C++ compiler, check for declaration of 'basename(char *)'.
        * configure: Regenerate.
	* config.in: Regenerate.

libiberty/ChangeLog:
2010-06-03  Joern Rennecke <joern.rennecke@embecosm.com>
	    Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	PR bootstrap/42798
	* configure.ac: Check for declaration of 'basename(char *)'.
	* configure: Regenerate.

opcodes/ChangeLog:
2010-06-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure.in: Check for declaration of 'basename(char *)',
        * configure: Regenerate.
	* config.in: Regenerate.

Index: bfd/configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.285
diff -u -r1.285 configure.in
--- bfd/configure.in	25 May 2010 14:12:37 -0000	1.285
+++ bfd/configure.in	3 Jun 2010 06:48:45 -0000
@@ -194,7 +194,7 @@
 AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid fileno)
 AC_CHECK_FUNCS(strtoull)
 
-AC_CHECK_DECLS(basename)
+AC_CHECK_DECLS([basename(char *)])
 AC_CHECK_DECLS(ftello)
 AC_CHECK_DECLS(ftello64)
 AC_CHECK_DECLS(fseeko)
Index: gold/configure.ac
===================================================================
RCS file: /cvs/src/src/gold/configure.ac,v
retrieving revision 1.56
diff -u -r1.56 configure.ac
--- gold/configure.ac	27 Apr 2010 14:12:32 -0000	1.56
+++ gold/configure.ac	3 Jun 2010 06:49:03 -0000
@@ -376,19 +376,13 @@
 AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
 AM_CONDITIONAL(HAVE_ZLIB, test "$ac_cv_search_zlibVersion" != "no")
 
-dnl We have to check these in C, not C++, because autoconf generates
-dnl tests which have no type information, and current glibc provides
-dnl multiple declarations of functions like basename when compiling
-dnl with C++.
-AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf, strverscmp])
-
 AC_LANG_PUSH(C++)
 
 AC_CHECK_HEADERS(tr1/unordered_set tr1/unordered_map)
 AC_CHECK_HEADERS(ext/hash_map ext/hash_set)
 AC_CHECK_HEADERS(byteswap.h)
 AC_CHECK_FUNCS(mallinfo posix_fallocate readv sysconf times)
-AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf, strverscmp, strndup, memmem])
+AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf, strverscmp, strndup, memmem])
 
 # Use of ::std::tr1::unordered_map::rehash causes undefined symbols
 # at link time with some versions of GCC.
Index: libiberty/configure.ac
===================================================================
RCS file: /cvs/src/src/libiberty/configure.ac,v
retrieving revision 1.51
diff -u -r1.51 configure.ac
--- libiberty/configure.ac	5 Jan 2010 21:10:30 -0000	1.51
+++ libiberty/configure.ac	3 Jun 2010 06:49:11 -0000
@@ -379,7 +379,7 @@
     table times tmpnam \
     vasprintf vfprintf vprintf vsprintf \
     wait3 wait4 waitpid)
-  AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf])
+  AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf])
   AC_DEFINE(HAVE_SYS_ERRLIST, 1, [Define if you have the sys_errlist variable.])
   AC_DEFINE(HAVE_SYS_NERR,    1, [Define if you have the sys_nerr variable.])
   AC_DEFINE(HAVE_SYS_SIGLIST, 1, [Define if you have the sys_siglist variable.])
@@ -663,7 +663,7 @@
     [AC_MSG_RESULT([no])])
 
   AC_CHECK_FUNCS($checkfuncs)
-  AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf])
+  AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf])
   AC_CHECK_DECLS([calloc, getenv, getopt, malloc, realloc, sbrk])
   AC_CHECK_DECLS([strverscmp])
   libiberty_NEED_DECLARATION(canonicalize_file_name)
Index: opcodes/configure.in
===================================================================
RCS file: /cvs/src/src/opcodes/configure.in,v
retrieving revision 1.95
diff -u -r1.95 configure.in
--- opcodes/configure.in	25 Mar 2010 21:12:36 -0000	1.95
+++ opcodes/configure.in	3 Jun 2010 06:49:17 -0000
@@ -68,7 +68,7 @@
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h)
 
-AC_CHECK_DECLS([basename, stpcpy])
+AC_CHECK_DECLS([basename(char *), stpcpy])
 
 cgen_maint=no
 cgendir='$(srcdir)/../cgen'