Re: Binutils build broken at FreeBSD 5.3 after -Werror enabling

[Nick Clifton]

Hi Vladimir,

> Binutils with patches build pass gas part 

Good - I have checked the gas patch in.

and terminated now at (i miss this warning in prev. e-mail, sorry):

> /usr/home/wanderer/pkg/build/binutils/src/src/gprof/gprof.c:45:
> /usr/home/wanderer/pkg/build/binutils/src/src/ld/lexsup.c:29:
> /usr/home/wanderer/pkg/build/binutils/src/src/ld/ldemul.c:25:
> In file included from eelf_i386_fbsd.c:31:
> In file included from eelf_i386.c:31:

The attached patch should solve all of these, I hope.  Please could you 
test it.  (I have also attached the regenerated configure files for you).

Cheers
  Nick


Index: ld/config.in
===================================================================
RCS file: /cvs/src/src/ld/config.in,v
retrieving revision 1.12
diff -c -3 -p -r1.12 config.in
*** ld/config.in        21 Feb 2005 11:49:47 -0000      1.12
--- ld/config.in        1 Apr 2005 13:20:15 -0000
***************
*** 175,177 ****
--- 175,179 ----
  /* Additional extension a shared object might have. */
  #undef EXTRA_SHLIB_EXTENSION
  
+ /* Is the prototype for getopt in <unistd.h> in the expected format?  */
+ #undef HAVE_DECL_GETOPT

Index: ld/configure.in
===================================================================
RCS file: /cvs/src/src/ld/configure.in,v
retrieving revision 1.28
diff -c -3 -p -r1.28 configure.in
*** ld/configure.in     16 Mar 2005 17:18:17 -0000      1.28
--- ld/configure.in     1 Apr 2005 13:20:17 -0000
*************** AC_CHECK_HEADERS(string.h strings.h stdl
*** 138,143 ****
--- 138,153 ----
  AC_CHECK_FUNCS(sbrk realpath glob)
  AC_HEADER_DIRENT
  
+ AC_MSG_CHECKING(for a known getopt prototype in unistd.h)
+ AC_CACHE_VAL(ld_cv_decl_getopt_unistd_h,
+ [AC_TRY_COMPILE([#include <unistd.h>], [extern int getopt (int, char *const*, 
const char *);],
+ ld_cv_decl_getopt_unistd_h=yes, ld_cv_decl_getopt_unistd_h=no)])
+ AC_MSG_RESULT($ld_cv_decl_getopt_unistd_h)
+ if test $ld_cv_decl_getopt_unistd_h = yes; then
+   AC_DEFINE([HAVE_DECL_GETOPT], 1,
+           [Is the prototype for getopt in <unistd.h> in the expected format?])
+ fi
+       
  BFD_BINARY_FOPEN
  
  BFD_NEED_DECLARATION(strstr)

Index: ld/ldemul.c
===================================================================
RCS file: /cvs/src/src/ld/ldemul.c,v
retrieving revision 1.16
diff -c -3 -p -r1.16 ldemul.c
*** ld/ldemul.c 3 Mar 2005 11:51:58 -0000       1.16
--- ld/ldemul.c 1 Apr 2005 13:20:17 -0000
*************** along with GLD; see the file COPYING.  I
*** 20,25 ****
--- 20,26 ----
  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.  */
  
+ #include "config.h"
  #include "bfd.h"
  #include "sysdep.h"
  #include "getopt.h"

Index: ld/lexsup.c
===================================================================
RCS file: /cvs/src/src/ld/lexsup.c,v
retrieving revision 1.84
diff -c -3 -p -r1.84 lexsup.c
*** ld/lexsup.c 16 Mar 2005 21:52:43 -0000      1.84
--- ld/lexsup.c 1 Apr 2005 13:20:17 -0000
***************
*** 20,25 ****
--- 20,26 ----
     Software Foundation, 59 Temple Place - Suite 330, Boston, MA
     02111-1307, USA.  */
  
+ #include "config.h"
  #include "bfd.h"
  #include "sysdep.h"
  #include "libiberty.h"

Index: ld/emultempl/elf32.em
===================================================================
RCS file: /cvs/src/src/ld/emultempl/elf32.em,v
retrieving revision 1.137
diff -c -3 -p -r1.137 elf32.em
*** ld/emultempl/elf32.em       29 Mar 2005 11:07:37 -0000      1.137
--- ld/emultempl/elf32.em       1 Apr 2005 13:20:18 -0000
*************** Foundation, Inc., 59 Temple Place - Suit
*** 35,40 ****
--- 35,41 ----
  
  #define TARGET_IS_${EMULATION_NAME}
  
+ #include "config.h"
  #include "bfd.h"
  #include "sysdep.h"
  #include "libiberty.h"

Index: gprof/configure.in
===================================================================
RCS file: /cvs/src/src/gprof/configure.in,v
retrieving revision 1.23
diff -c -3 -p -r1.23 configure.in
*** gprof/configure.in  16 Mar 2005 17:18:16 -0000      1.23
--- gprof/configure.in  1 Apr 2005 13:20:20 -0000
*************** AC_EXEEXT
*** 32,37 ****
--- 32,47 ----
  
  AC_CHECK_HEADERS(sys/gmon_out.h)
  
+ AC_MSG_CHECKING(for a known getopt prototype in unistd.h)
+ AC_CACHE_VAL(gprof_cv_decl_getopt_unistd_h,
+ [AC_TRY_COMPILE([#include <unistd.h>], [extern int getopt (int, char *const*, 
const char *);],
+ gprof_cv_decl_getopt_unistd_h=yes, gprof_cv_decl_getopt_unistd_h=no)])
+ AC_MSG_RESULT($gprof_cv_decl_getopt_unistd_h)
+ if test $gprof_cv_decl_getopt_unistd_h = yes; then
+   AC_DEFINE([HAVE_DECL_GETOPT], 1,
+           [Is the prototype for getopt in <unistd.h> in the expected format?])
+ fi
+ 
  build_warnings="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
  
  AC_ARG_ENABLE(werror,

Index: gprof/gconfig.in
===================================================================
RCS file: /cvs/src/src/gprof/gconfig.in,v
retrieving revision 1.10
diff -c -3 -p -r1.10 gconfig.in
*** gprof/gconfig.in    19 Mar 2004 07:07:22 -0000      1.10
--- gprof/gconfig.in    1 Apr 2005 13:20:20 -0000
***************
*** 139,141 ****
--- 139,143 ----
  /* Define as 1 if you have gettext and don't want to use GNU gettext. */
  #undef HAVE_GETTEXT
  
+ /* Is the prototype for getopt in <unistd.h> in the expected format?  */
+ #undef HAVE_DECL_GETOPT

regnerated-configure-files.tar.bz2
Description: BZip2 compressed data