[RFA] fix compilation warning in libiberty.h

[RFA] fix compilation warning in libiberty.h

[Jerome Guitton]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

The problem has been reported by Joel Brobecker:

http://sourceware.org/ml/binutils/2005-03/msg00529.html

HAVE_DECL_BASENAME was not defined during bfd's configure. This patch
should fix the problem.

OK to apply?

2005-03-31  Jerome Guitton  <guitton@gnat.com>

	* bfd/config.in (HAVE_DECL_BASENAME): New configure macro.
	* bfd/configure.in: Check for basename.
	* bfd/configure: Regenerate.


[-- Attachment #2: bfdconfig.dif --]
[-- Type: text/plain, Size: 3678 bytes --]

Index: config.in
===================================================================
RCS file: /cvs/src/src/bfd/config.in,v
retrieving revision 1.20
diff -u -p -r1.20 config.in
--- config.in	30 Mar 2005 02:46:24 -0000	1.20
+++ config.in	31 Mar 2005 12:33:44 -0000
@@ -24,6 +24,9 @@
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
+/* Define to 1 if basename is declared by the system. */
+#undef HAVE_DECL_BASENAME
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
Index: configure
===================================================================
RCS file: /cvs/src/src/bfd/configure,v
retrieving revision 1.200
diff -u -p -r1.200 configure
--- configure	30 Mar 2005 02:46:24 -0000	1.200
+++ configure	31 Mar 2005 12:33:46 -0000
@@ -9539,6 +9539,76 @@ fi
 done
 
 
+echo "$as_me:$LINENO: checking for a declaration for basename" >&5
+echo $ECHO_N "checking for a declaration for basename... $ECHO_C" >&6
+if test "${bfd_cv_decl_basename+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "sysdep.h"
+int
+main ()
+{
+#ifndef basename
+char *(*pfn)(char *) = basename;
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  bfd_cv_decl_basename=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+bfd_cv_decl_basename=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+echo "$as_me:$LINENO: result: $bfd_cv_decl_basename" >&5
+echo "${ECHO_T}$bfd_cv_decl_basename" >&6
+if test $bfd_cv_decl_basename = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECL_BASENAME 1
+_ACEOF
+
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DECL_BASENAME 0
+_ACEOF
+
+fi
+
 
 case "${host}" in
 *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
Index: configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.172
diff -u -p -r1.172 configure.in
--- configure.in	30 Mar 2005 02:46:24 -0000	1.172
+++ configure.in	31 Mar 2005 12:33:46 -0000
@@ -162,6 +162,22 @@ AC_HEADER_DIRENT
 AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid)
 AC_CHECK_FUNCS(strtoull)
 
+AC_MSG_CHECKING(for a declaration for basename)
+AC_CACHE_VAL(bfd_cv_decl_basename,
+[AC_TRY_COMPILE([#include "sysdep.h"],
+[#ifndef basename
+char *(*pfn)(char *) = basename;
+#endif],
+bfd_cv_decl_basename=yes, bfd_cv_decl_basename=no)])
+AC_MSG_RESULT($bfd_cv_decl_basename)
+if test $bfd_cv_decl_basename = yes; then
+AC_DEFINE([HAVE_DECL_BASENAME], 1,
+[Is basename declared by the system?])
+else
+AC_DEFINE([HAVE_DECL_BASENAME], 0,
+[Is basename declared by the system?])
+fi
+
 BFD_BINARY_FOPEN
 
 BFD_NEED_DECLARATION(ffs)

Re: [RFA] fix compilation warning in libiberty.h

[Daniel Jacobowitz]

On Thu, Mar 31, 2005 at 03:27:34PM +0200, Jerome Guitton wrote:
> The problem has been reported by Joel Brobecker:
> 
> http://sourceware.org/ml/binutils/2005-03/msg00529.html
> 
> HAVE_DECL_BASENAME was not defined during bfd's configure. This patch
> should fix the problem.
> 
> OK to apply?

No...

> +AC_MSG_CHECKING(for a declaration for basename)
> +AC_CACHE_VAL(bfd_cv_decl_basename,
> +[AC_TRY_COMPILE([#include "sysdep.h"],
> +[#ifndef basename

Can't this be just AC_CHECK_DECLS(basename)?

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [RFA] fix compilation warning in libiberty.h

[Jerome Guitton]

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

Daniel Jacobowitz (drow@false.org):

> Can't this be just AC_CHECK_DECLS(basename)?

You mean there actually is such a function? I must be *really* stupid ;-)

Removing my junk autoconf code and replacing it with a simple call to
AC_CHECK_DECLS... New patch attached, same Changelog entry! Is this one OK?

-- 
Jerome

[-- Attachment #2: bfdconfig.dif --]
[-- Type: text/plain, Size: 3271 bytes --]

Index: config.in
===================================================================
RCS file: /cvs/src/src/bfd/config.in,v
retrieving revision 1.20
diff -u -p -r1.20 config.in
--- config.in	30 Mar 2005 02:46:24 -0000	1.20
+++ config.in	31 Mar 2005 15:02:26 -0000
@@ -24,6 +24,9 @@
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
+/* Define to 1 if basename is declared by the system. */
+#undef HAVE_DECL_BASENAME
+
 /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
    */
 #undef HAVE_DIRENT_H
Index: configure
===================================================================
RCS file: /cvs/src/src/bfd/configure,v
retrieving revision 1.200
diff -u -p -r1.200 configure
--- configure	30 Mar 2005 02:46:24 -0000	1.200
+++ configure	31 Mar 2005 15:02:29 -0000
@@ -9539,6 +9539,80 @@ fi
 done
 
 
+echo "$as_me:$LINENO: checking whether basename is declared" >&5
+echo $ECHO_N "checking whether basename is declared... $ECHO_C" >&6
+if test "${ac_cv_have_decl_basename+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include "sysdep.h"
+
+int
+main ()
+{
+#ifndef basename
+  char *p = (char *) basename;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_have_decl_basename=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_have_decl_basename=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_have_decl_basename" >&5
+echo "${ECHO_T}$ac_cv_have_decl_basename" >&6
+if test $ac_cv_have_decl_basename = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_BASENAME 1
+_ACEOF
+
+
+else
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_BASENAME 0
+_ACEOF
+
+
+fi
+
+
+
 
 case "${host}" in
 *-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
Index: configure.in
===================================================================
RCS file: /cvs/src/src/bfd/configure.in,v
retrieving revision 1.172
diff -u -p -r1.172 configure.in
--- configure.in	30 Mar 2005 02:46:24 -0000	1.172
+++ configure.in	31 Mar 2005 15:02:29 -0000
@@ -162,6 +162,8 @@ AC_HEADER_DIRENT
 AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen getuid getgid)
 AC_CHECK_FUNCS(strtoull)
 
+AC_CHECK_DECLS(basename, , , [#include "sysdep.h"])
+
 BFD_BINARY_FOPEN
 
 BFD_NEED_DECLARATION(ffs)

Re: [RFA] fix compilation warning in libiberty.h

[Daniel Jacobowitz]

On Thu, Mar 31, 2005 at 05:11:33PM +0200, Jerome Guitton wrote:
> Daniel Jacobowitz (drow@false.org):
> 
> > Can't this be just AC_CHECK_DECLS(basename)?
> 
> You mean there actually is such a function? I must be *really* stupid ;-)
> 
> Removing my junk autoconf code and replacing it with a simple call to
> AC_CHECK_DECLS... New patch attached, same Changelog entry! Is this one OK?

Yes, thanks.


-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [RFA] fix compilation warning in libiberty.h

[Jerome Guitton]

Daniel Jacobowitz (drow@false.org):

> Yes, thanks.

Committed. Thank you.

-- 
Jerome

Re: [RFA] fix compilation warning in libiberty.h

[Maciej W. Rozycki]

On Thu, 31 Mar 2005, Jerome Guitton wrote:

> 2005-03-31  Jerome Guitton  <guitton@gnat.com>
> 
> 	* bfd/config.in (HAVE_DECL_BASENAME): New configure macro.

 Note this is a generated file!

  Maciej

Re: [RFA] fix compilation warning in libiberty.h

[Jerome Guitton]

Maciej W. Rozycki (macro@linux-mips.org):

>  Note this is a generated file!

O god. Sorry for the mess, let me clean it up...

-- 
Jerome

Re: [RFA] fix compilation warning in libiberty.h

[Adam Nemet]

Daniel Jacobowitz writes:
> On Thu, Mar 31, 2005 at 03:27:34PM +0200, Jerome Guitton wrote:
>> +AC_MSG_CHECKING(for a declaration for basename)
>> +AC_CACHE_VAL(bfd_cv_decl_basename,
>> +[AC_TRY_COMPILE([#include "sysdep.h"],
>> +[#ifndef basename
> 
> Can't this be just AC_CHECK_DECLS(basename)?

The checked in version was:

  AC_CHECK_DECLS(basename, , , [#include "sysdep.h"]) 

How is this supposed to find sysdep.h?  I am getting:

  $ grep -C basename bfd/config.log
  configure:9522: $? = 0
  configure:9534: result: yes
  configure:9545: checking whether basename is declared
  configure:9570: gcc -c -g -O2  conftest.c >&5
  conftest.c:73:20: sysdep.h: No such file or directory

Adam

Re: [RFA] fix compilation warning in libiberty.h

[Daniel Jacobowitz]

On Fri, Apr 22, 2005 at 04:05:19PM -0700, Adam Nemet wrote:
> Daniel Jacobowitz writes:
> > On Thu, Mar 31, 2005 at 03:27:34PM +0200, Jerome Guitton wrote:
> >> +AC_MSG_CHECKING(for a declaration for basename)
> >> +AC_CACHE_VAL(bfd_cv_decl_basename,
> >> +[AC_TRY_COMPILE([#include "sysdep.h"],
> >> +[#ifndef basename
> > 
> > Can't this be just AC_CHECK_DECLS(basename)?
> 
> The checked in version was:
> 
>   AC_CHECK_DECLS(basename, , , [#include "sysdep.h"]) 
> 
> How is this supposed to find sysdep.h?  I am getting:
> 
>   $ grep -C basename bfd/config.log
>   configure:9522: $? = 0
>   configure:9534: result: yes
>   configure:9545: checking whether basename is declared
>   configure:9570: gcc -c -g -O2  conftest.c >&5
>   conftest.c:73:20: sysdep.h: No such file or directory

This should be fixed as of Wednesday; do you still see the problem?

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [RFA] fix compilation warning in libiberty.h

[Adam Nemet]

Daniel Jacobowitz writes:
> This should be fixed as of Wednesday; do you still see the problem?

No, I don't.  Just for the record this also fixes LynxOS native
builds.

Thanks,
Adam

Re: [RFA] fix compilation warning in libiberty.h

[Jerome Guitton]

Adam Nemet (anemet@lnxw.com):

> The checked in version was:
> 
>   AC_CHECK_DECLS(basename, , , [#include "sysdep.h"]) 
> 
> How is this supposed to find sysdep.h?

It makes me think that I did the same mistake in opcodes. I checked in
the following patch, as obvious. Hopefully everything I broke recently
is now fixed. Thanks for your patience, all of you.

2005-04-26  Jerome Guitton  <guitton@gnat.com>

	* configure.in: Fix the check for basename declaration.
	* configure: Regenerate.

Index: configure.in
===================================================================
RCS file: /cvs/src/src/opcodes/configure.in,v
retrieving revision 1.55
diff -u -r1.55 configure.in
--- configure.in	14 Apr 2005 09:48:22 -0000	1.55
+++ configure.in	26 Apr 2005 10:14:18 -0000
@@ -72,7 +72,7 @@
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h)
 
-AC_CHECK_DECLS(basename, , , [#include "sysdep.h"])
+AC_CHECK_DECLS(basename)
 
 cgen_maint=no
 cgendir='$(srcdir)/../cgen'

Re: [RFA] Fix compilation warning in libiberty.h

[Daniel Jacobowitz]

On Fri, Mar 18, 2005 at 09:55:52AM -0800, Joel Brobecker wrote:
> Hello,
> 
> I noticed that the compiler emits a warning when building bfd.c
> in libiberty.h. The compiler we are using is GNAT Pro based on
> GCC 3.4.4. Here is the warning we get:
> 
> gcc -DHAVE_CONFIG_H -I. -I.././bfd -I. -D_GNU_SOURCE -I. -I.././bfd -I.././bfd/../include -I.././bfd/../intl -I../intl -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror -g -O2 -c bfd.c -o bfd.o
> In file included from bfd.c:209:
> .././bfd/../include/libiberty.h:80: warning: function declaration isn't a prototype
> 
> The problem is that this breaks the build because of the -Werror.
> 
> I think the problem is that the prototype is missing a ``void'' keyword.
> This fixes the warning. The trouble I had was whether I wanted to use
> the PARAMS macro or not. I seem to remember that we wanted to get away
> from them, but then the rest of the file uses it. I kept it for now,
> for better consistency.
> 
> Joel Brobecker  <brobecker@adacore.com>
> 
>         * include/libiberty.h,v (basename): Fix prototype definition.
> 
> Tested by building GDB on sparc-solaris 2.8.
> OK to apply?

No, this is wrong; that's not supposed to be a prototype!  You want to
be in the other branch of the #if; fix that instead.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

[RFA] Fix compilation warning in libiberty.h

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]

Hello,

I noticed that the compiler emits a warning when building bfd.c
in libiberty.h. The compiler we are using is GNAT Pro based on
GCC 3.4.4. Here is the warning we get:

gcc -DHAVE_CONFIG_H -I. -I.././bfd -I. -D_GNU_SOURCE -I. -I.././bfd -I.././bfd/../include -I.././bfd/../intl -I../intl -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Werror -g -O2 -c bfd.c -o bfd.o
In file included from bfd.c:209:
.././bfd/../include/libiberty.h:80: warning: function declaration isn't a prototype

The problem is that this breaks the build because of the -Werror.

I think the problem is that the prototype is missing a ``void'' keyword.
This fixes the warning. The trouble I had was whether I wanted to use
the PARAMS macro or not. I seem to remember that we wanted to get away
from them, but then the rest of the file uses it. I kept it for now,
for better consistency.

Joel Brobecker  <brobecker@adacore.com>

        * include/libiberty.h,v (basename): Fix prototype definition.

Tested by building GDB on sparc-solaris 2.8.
OK to apply?

Thanks,
-- 
Joel

[-- Attachment #2: libiberty.h.diff --]
[-- Type: text/plain, Size: 736 bytes --]

Index: include/libiberty.h
===================================================================
RCS file: /cvs/src/src/include/libiberty.h,v
retrieving revision 1.31
diff -u -p -r1.31 libiberty.h
--- include/libiberty.h	10 Mar 2005 01:05:51 -0000	1.31
+++ include/libiberty.h	18 Mar 2005 17:38:07 -0000
@@ -77,7 +77,7 @@ extern char **dupargv PARAMS ((char **))
 #if defined (__GNU_LIBRARY__ ) || defined (__linux__) || defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__NetBSD__) || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) || defined (HAVE_DECL_BASENAME)
 extern char *basename PARAMS ((const char *));
 #else
-extern char *basename ();
+extern char *basename PARAMS ((void));
 #endif
 #endif