diff options
| author |   Nick Clifton <nickc@redhat.com> | 2012-05-11 14:25:30 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2012-05-11 14:25:30 +0000 |
| commit | 208a4923edd990535a9bbf73bf39a8609771aec3 (patch) | |
| tree | 03814f8704619ced31086f6b9e5bd345889fab33 /binutils | |
| parent | 2012-05-11 Yao Qi <yao@codesourcery.com> (diff) | |
| download | binutils-gdb-208a4923edd990535a9bbf73bf39a8609771aec3.tar.gz binutils-gdb-208a4923edd990535a9bbf73bf39a8609771aec3.tar.bz2 binutils-gdb-208a4923edd990535a9bbf73bf39a8609771aec3.zip | |
PR binutils/14028
* configure.in: Invoke ACX_HEADER_STRING.
* configure: Regenerate.
* config.in: Regenerate.
* sysdep.h: If STRINGS_WITH_STRING is defined then include both
string.h and strings.h.
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 13 | ||||
| -rwxr-xr-x | binutils/configure | 1 | ||||
| -rw-r--r-- | binutils/configure.in | 1 | ||||
| -rw-r--r-- | binutils/sysdep.h | 5 |
4 files changed, 18 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c5b85c065c0..f620fe02a6c 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,12 +1,21 @@ +2012-05-11 Daniel Richard G. <skunk@iskunk.org> + + PR binutils/14028 + * configure.in: Invoke ACX_HEADER_STRING. + * configure: Regenerate. + * config.in: Regenerate. + * sysdep.h: If STRINGS_WITH_STRING is defined then include both + string.h and strings.h. + 2012-05-10 Jakub Jelinek <jakub@redhat.com> * dwarf.c (read_and_display_attr_value): Don't look up tag from abbrev for DW_FORM_ref_addr. 2012-05-08 Sean Keys <skeys@ipdatasys.com> - + * binutils/MAINTAINERS: Added my entry to the maintainers secion. - + 2012-05-08 Cary Coutant <ccoutant@google.com> * doc/binutils.texi (objcopy): Add --strip-dwo, --extract-dwo options. diff --git a/binutils/configure b/binutils/configure index 656918125f5..e7f03c5f13f 100755 --- a/binutils/configure +++ b/binutils/configure @@ -12491,6 +12491,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi +ACX_HEADER_STRING # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 diff --git a/binutils/configure.in b/binutils/configure.in index 9ba8c77723d..0d037428c9c 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -91,6 +91,7 @@ AC_SUBST(DEMANGLER_NAME) AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h locale.h sys/param.h) AC_HEADER_SYS_WAIT +ACX_HEADER_STRING AC_FUNC_ALLOCA AC_CHECK_FUNCS(sbrk utimes setmode getc_unlocked strcoll setlocale) AC_CHECK_FUNC([mkstemp], diff --git a/binutils/sysdep.h b/binutils/sysdep.h index 0e1d502fcdc..5164e791c55 100644 --- a/binutils/sysdep.h +++ b/binutils/sysdep.h @@ -46,6 +46,10 @@ extern int errno; #include <unistd.h> #endif +#ifdef STRING_WITH_STRINGS +#include <string.h> +#include <strings.h> +#else #ifdef HAVE_STRING_H #include <string.h> #else @@ -56,6 +60,7 @@ extern char *strchr (); extern char *strrchr (); #endif #endif +#endif #ifdef HAVE_STDLIB_H #include <stdlib.h> |