aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
Diffstat (limited to 'binutils')
-rw-r--r--binutils/ChangeLog13
-rwxr-xr-xbinutils/configure1
-rw-r--r--binutils/configure.in1
-rw-r--r--binutils/sysdep.h5
4 files changed, 18 insertions, 2 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c5b85c0..f620fe0 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 6569181..e7f03c5 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 9ba8c77..0d03742 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 0e1d502..5164e79 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>