merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index fffd19a28c4ba785c42ee48b4315d2f80b47361c..36326fb43addc493110e0d0e41e02edd650450b3 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-17  DJ Delorie  <dj@redhat.com>
+
+       * configure.ac (target_header_dir, msdosdjgpp): Remove duplicate
+       gettimeofday entry.
+       * configure: Likewise.
+
 2007-07-11  Alexandre Oliva  <aoliva@redhat.com>
 
        * maint-tool (deps): Output stamp-h instead of config.h.

diff --git a/libiberty/configure b/libiberty/configure
index 0312cc418d294be3557fa5840f4c55f36c1b7307..e444bd367d87c6aaa15154e2efeae3db47a36998 100755 (executable)
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -6141,7 +6141,7 @@ _ACEOF
 
   *-*-msdosdjgpp)
     for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \
-             getcwd getpagesize getrusage gettimeofday gettimeofday \
+             getcwd getpagesize getrusage gettimeofday \
              index insque memchr memcmp memcpy memmove memset psignal \
              putenv random rename rindex sbrk setenv stpcpy strcasecmp \
              strchr strdup strerror strncasecmp strrchr strstr strtod \

diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 371864e1e7a293544b710653edb5e5916d90a579..864db177be941c6279ea3e6f7e58843ee3c4d96a 100644 (file)
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -549,7 +549,7 @@ if test -z "${setobjs}"; then
 
   *-*-msdosdjgpp)
     for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \
-             getcwd getpagesize getrusage gettimeofday gettimeofday \
+             getcwd getpagesize getrusage gettimeofday \
              index insque memchr memcmp memcpy memmove memset psignal \
              putenv random rename rindex sbrk setenv stpcpy strcasecmp \
              strchr strdup strerror strncasecmp strrchr strstr strtod \