diff options
| author | DJ Delorie <dj@redhat.com> | 2009-04-14 18:05:58 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2009-04-14 18:05:58 +0000 |
| commit | 68724c3d39f77dc02261f8c7fe57b50842a35f68 (patch) | |
| tree | b61f7c17b02f183ad95742143dca11b0f7cf3f66 /libiberty | |
| parent | d12672ccc73fe8f54b9ca248ed83cfbfea644710 (diff) | |
| download | binutils-68724c3d39f77dc02261f8c7fe57b50842a35f68.zip binutils-68724c3d39f77dc02261f8c7fe57b50842a35f68.tar.gz binutils-68724c3d39f77dc02261f8c7fe57b50842a35f68.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 8 | ||||
| -rwxr-xr-x | libiberty/configure | 73 | ||||
| -rw-r--r-- | libiberty/configure.ac | 39 |
3 files changed, 83 insertions, 37 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index c58f635..3952b54 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,11 @@ +2009-04-14 Eli Zaretskii <eliz@gnu.org> + + * configure.ac (setobjs, msdosdjgpp): Move a-priori setting of + existing and required library functions to with_target_subdir + section, so that the native build does detect them at configure + time. + * configure: Regenerated. + 2009-04-13 Ozkan Sezer <sezeroz@gmail.com> PR target/39397 diff --git a/libiberty/configure b/libiberty/configure index ee8fbb0..15ddff2 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -6375,6 +6375,59 @@ _ACEOF setobjs=yes ;; + *-*-msdosdjgpp) + case $LIBOBJS in + "vasprintf.$ac_objext" | \ + *" vasprintf.$ac_objext" | \ + "vasprintf.$ac_objext "* | \ + *" vasprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS vasprintf.$ac_objext" ;; +esac + + case $LIBOBJS in + "vsnprintf.$ac_objext" | \ + *" vsnprintf.$ac_objext" | \ + "vsnprintf.$ac_objext "* | \ + *" vsnprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS vsnprintf.$ac_objext" ;; +esac + + case $LIBOBJS in + "snprintf.$ac_objext" | \ + *" snprintf.$ac_objext" | \ + "snprintf.$ac_objext "* | \ + *" snprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS snprintf.$ac_objext" ;; +esac + + case $LIBOBJS in + "asprintf.$ac_objext" | \ + *" asprintf.$ac_objext" | \ + "asprintf.$ac_objext "* | \ + *" asprintf.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS asprintf.$ac_objext" ;; +esac + + + for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \ + 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 \ + strtol strtoul sysconf times tmpnam vfprintf vprintf \ + vsprintf waitpid + do + n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >>confdefs.h <<_ACEOF +#define $n 1 +_ACEOF + + done + + + setobjs=yes + ;; + esac # We may wish to install the target headers somewhere. @@ -6538,26 +6591,6 @@ _ACEOF setobjs=yes ;; - *-*-msdosdjgpp) - for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \ - 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 \ - strtol strtoul sysconf times tmpnam vfprintf vprintf \ - vsprintf waitpid - do - n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >>confdefs.h <<_ACEOF -#define $n 1 -_ACEOF - - done - - - setobjs=yes - ;; - esac fi diff --git a/libiberty/configure.ac b/libiberty/configure.ac index 6cfe335..90d6060 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -469,6 +469,28 @@ if test -n "${with_target_subdir}"; then setobjs=yes ;; + *-*-msdosdjgpp) + AC_LIBOBJ([vasprintf]) + AC_LIBOBJ([vsnprintf]) + AC_LIBOBJ([snprintf]) + AC_LIBOBJ([asprintf]) + + for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \ + 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 \ + strtol strtoul sysconf times tmpnam vfprintf vprintf \ + vsprintf waitpid + do + n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + AC_DEFINE_UNQUOTED($n) + done + + + setobjs=yes + ;; + esac # We may wish to install the target headers somewhere. @@ -548,23 +570,6 @@ if test -z "${setobjs}"; then setobjs=yes ;; - *-*-msdosdjgpp) - for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \ - 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 \ - strtol strtoul sysconf times tmpnam vfprintf vprintf \ - vsprintf waitpid - do - n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - AC_DEFINE_UNQUOTED($n) - done - - - setobjs=yes - ;; - esac fi |