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 /gas | |
| parent | bde24c0a34fd79fb9ee6c7a355a46917cd866d26 (diff) | |
| download | gdb-208a4923edd990535a9bbf73bf39a8609771aec3.zip gdb-208a4923edd990535a9bbf73bf39a8609771aec3.tar.gz gdb-208a4923edd990535a9bbf73bf39a8609771aec3.tar.bz2 | |
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 'gas')
| -rw-r--r-- | gas/ChangeLog | 9 | ||||
| -rw-r--r-- | gas/as.h | 9 | ||||
| -rwxr-xr-x | gas/configure | 1 | ||||
| -rw-r--r-- | gas/configure.in | 1 |
4 files changed, 19 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 82ef7b7..5eb6d0a 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2012-05-11 Daniel Richard G. <skunk@iskunk.org> + + PR binutils/14028 + * configure.in: Invoke ACX_HEADER_STRING. + * configure: Regenerate. + * config.in: Regenerate. + * as.h: If STRINGS_WITH_STRING is defined then include both + string.h and strings.h. + 2012-05-11 Georg-Johann Lay <avr@gjlay.de PR target/13503 @@ -1,6 +1,6 @@ /* as.h - global header file Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -42,6 +42,11 @@ /* System include files first... */ #include <stdio.h> + +#ifdef STRING_WITH_STRINGS +#include <string.h> +#include <strings.h> +#else #ifdef HAVE_STRING_H #include <string.h> #else @@ -49,6 +54,8 @@ #include <strings.h> #endif #endif +#endif + #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif diff --git a/gas/configure b/gas/configure index 9f81627..c20a890 100755 --- a/gas/configure +++ b/gas/configure @@ -13180,6 +13180,7 @@ fi done +ACX_HEADER_STRING # Put this here so that autoconf's "cross-compiling" message doesn't confuse # people who are not cross-compiling but are compiling cross-assemblers. diff --git a/gas/configure.in b/gas/configure.in index 618095c..280fc70 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -634,6 +634,7 @@ AM_CONDITIONAL(GENINSRC_NEVER, false) AC_EXEEXT AC_CHECK_HEADERS(string.h stdlib.h memory.h strings.h unistd.h errno.h sys/types.h limits.h locale.h time.h sys/stat.h) +ACX_HEADER_STRING # Put this here so that autoconf's "cross-compiling" message doesn't confuse # people who are not cross-compiling but are compiling cross-assemblers. |