merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index fffd19a..36326fb 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 0312cc4..e444bd3 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 371864e..864db17 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 \