From 3e321448fa47e472f55e773cb6747f981cdf0dbf Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 16 Aug 2005 19:35:22 +0000 Subject: [PATCH] 2005-08-16 H.J. Lu * bucomm.h (stpcpy): Declare if HAVE_DECL_STPCPY isn't defined. * configure.in (AC_GNU_SOURCE): Added. (AC_CHECK_DECLS): Add stpcpy. * configure: Regenerated. * config.in: Likewise. --- binutils/ChangeLog | 9 +++++ binutils/bucomm.h | 4 +++ binutils/config.in | 9 +++++ binutils/configure | 76 +++++++++++++++++++++++++++++++++++++++++++ binutils/configure.in | 3 +- 5 files changed, 100 insertions(+), 1 deletion(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index fcbf64423a..53fe7cfcbe 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2005-08-16 H.J. Lu + + * bucomm.h (stpcpy): Declare if HAVE_DECL_STPCPY isn't defined. + + * configure.in (AC_GNU_SOURCE): Added. + (AC_CHECK_DECLS): Add stpcpy. + * configure: Regenerated. + * config.in: Likewise. + 2005-08-16 Jakub Jelinek * unwind-ia64.c (UNW_DEC_SPILL_SPREL, UNW_DEC_SPILL_PSPREL, diff --git a/binutils/bucomm.h b/binutils/bucomm.h index 09dce10f8c..0872e96e69 100644 --- a/binutils/bucomm.h +++ b/binutils/bucomm.h @@ -68,6 +68,10 @@ extern char *strrchr (); #endif #endif +#if !HAVE_DECL_STPCPY +extern char *stpcpy (char *, const char *); +#endif + #if !HAVE_DECL_STRSTR extern char *strstr (); #endif diff --git a/binutils/config.in b/binutils/config.in index b690906d2f..f5296e8dc2 100644 --- a/binutils/config.in +++ b/binutils/config.in @@ -50,6 +50,10 @@ */ #undef HAVE_DECL_SBRK +/* Define to 1 if you have the declaration of `stpcpy', and to 0 if you don't. + */ +#undef HAVE_DECL_STPCPY + /* Define to 1 if you have the declaration of `strstr', and to 0 if you don't. */ #undef HAVE_DECL_STRSTR @@ -231,6 +235,11 @@ `char[]'. */ #undef YYTEXT_POINTER +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif + /* Enable LFS */ #undef _LARGEFILE64_SOURCE diff --git a/binutils/configure b/binutils/configure index 967cd06a89..21ca9feebe 100755 --- a/binutils/configure +++ b/binutils/configure @@ -4866,6 +4866,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +cat >>confdefs.h <<\_ACEOF +#define _GNU_SOURCE 1 +_ACEOF + + + for ac_prog in 'bison -y' byacc do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -9956,6 +9962,76 @@ else _ACEOF +fi +echo "$as_me:$LINENO: checking whether stpcpy is declared" >&5 +echo $ECHO_N "checking whether stpcpy is declared... $ECHO_C" >&6 +if test "${ac_cv_have_decl_stpcpy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef stpcpy + char *p = (char *) stpcpy; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_decl_stpcpy=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_have_decl_stpcpy=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_have_decl_stpcpy" >&5 +echo "${ECHO_T}$ac_cv_have_decl_stpcpy" >&6 +if test $ac_cv_have_decl_stpcpy = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STPCPY 1 +_ACEOF + + +else + cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STPCPY 0 +_ACEOF + + fi echo "$as_me:$LINENO: checking whether strstr is declared" >&5 echo $ECHO_N "checking whether strstr is declared... $ECHO_C" >&6 diff --git a/binutils/configure.in b/binutils/configure.in index 0f328a34e1..e2bde16313 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -41,6 +41,7 @@ if test -z "$host" ; then fi AC_PROG_CC +AC_GNU_SOURCE AC_PROG_YACC AM_PROG_LEX @@ -171,7 +172,7 @@ if test $bu_cv_header_utime_h = yes; then AC_DEFINE(HAVE_GOOD_UTIME_H, 1, [Does define struct utimbuf?]) fi -AC_CHECK_DECLS([fprintf, strstr, sbrk, getenv, environ, getc_unlocked]) +AC_CHECK_DECLS([fprintf, stpcpy, strstr, sbrk, getenv, environ, getc_unlocked]) BFD_BINARY_FOPEN