merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3f834e825a2d7270b3a4dfa19a861f9c6ab6306b..378ee0af0d3a25b723d578cac29b7601fdc36bf0 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,9 +1,3 @@
-2004-12-08  Ben Elliston  <bje@au.ibm.com>
-
-       * getopt.c: Include "ansidecl.h" for the ATTRIBUTE_UNUSED macro.
-       (_getopt_initialize): Annotate argc and argv parameters as unused.
-       * Makefile.in (getopt.o): Depend on $(INCDIR)/ansidecl.h.
-
 2004-12-07  DJ Delorie  <dj@redhat.com>
 
        * splay-tree.c (splay_tree_delete_helper): Redesign the logic so

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 3a6a59a48ebfe983b29631a7b076452367137e1f..ffa4ba51d67c9148737e99d405fbbae38e957d30 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -581,8 +581,7 @@ $(CONFIGURED_OFILES): stamp-picdir
        else true; fi
        $(COMPILE.c) $(srcdir)/getcwd.c $(OUTPUT_OPTION)
 
-./getopt.o: $(srcdir)/getopt.c config.h $(INCDIR)/getopt.h \
-       $(INCDIR)/ansidecl.h
+./getopt.o: $(srcdir)/getopt.c config.h $(INCDIR)/getopt.h
        if [ x"$(PICFLAG)" != x ]; then \
          $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt.c -o pic/$@; \
        else true; fi

diff --git a/libiberty/getopt.c b/libiberty/getopt.c
index 6d6ea14c41cc4ef2f33f13977c6b26636466131e..a1e482763c1cf9263669e4c1caf4c16cbc283f49 100644 (file)
--- a/libiberty/getopt.c
+++ b/libiberty/getopt.c
@@ -3,8 +3,8 @@
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
 
-   Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-       1996, 1997, 1998, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98
+       Free Software Foundation, Inc.
 
    NOTE: This source is derived from an old version taken from the GNU C
    Library (glibc).
@@ -90,9 +90,6 @@
 # endif
 #endif
 
-/* Needed for ATTRIBUTE_UNUSED.  */
-#include <ansidecl.h>
-
 /* This version of `getopt' appears to the caller like standard Unix `getopt'
    but it behaves differently for the user, since it allows the user
    to intersperse the options with the other arguments.
@@ -396,8 +393,8 @@ static const char *_getopt_initialize (int, char *const *, const char *);
 #endif
 static const char *
 _getopt_initialize (argc, argv, optstring)
-     int argc ATTRIBUTE_UNUSED;
-     char *const *argv ATTRIBUTE_UNUSED;
+     int argc;
+     char *const *argv;
      const char *optstring;
 {
   /* Start processing options with ARGV-element 1 (since ARGV-element 0