From 2d3a20632b8bbd0b80d2bbaba6d93032c0fb909b Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Sat, 22 Nov 2014 20:53:36 +0000 Subject: [PATCH] re PR other/63694 (Build error compiling asan.c: strtoull undeclared) PR other/63694 * libiberty/configure.ac: Check for strtol, strtoul, strtoll and strtoull declarations. * libiberty/configure: Regenerated. * gcc/configure.ac: Check for strtol, strtoul, strtoll and strtoull declarations. * gcc/configure: Regenerated. * gcc/config.in: Regenerated. From-SVN: r217972 --- gcc/config.in | 28 ++++++++++++++++++++++++++++ gcc/configure | 5 +++-- gcc/configure.ac | 1 + libiberty/configure | 41 +++++++++++++++++++++++++++++++++++++++++ libiberty/configure.ac | 1 + 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/gcc/config.in b/gcc/config.in index 6cfda75b0b3..9cc0198c5c1 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -952,6 +952,34 @@ #endif +/* Define to 1 if we found a declaration for 'strtol', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET +#undef HAVE_DECL_STRTOL +#endif + + +/* Define to 1 if we found a declaration for 'strtoll', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET +#undef HAVE_DECL_STRTOLL +#endif + + +/* Define to 1 if we found a declaration for 'strtoul', otherwise define to 0. + */ +#ifndef USED_FOR_TARGET +#undef HAVE_DECL_STRTOUL +#endif + + +/* Define to 1 if we found a declaration for 'strtoull', otherwise define to + 0. */ +#ifndef USED_FOR_TARGET +#undef HAVE_DECL_STRTOULL +#endif + + /* Define to 1 if we found a declaration for 'strverscmp', otherwise define to 0. */ #ifndef USED_FOR_TARGET diff --git a/gcc/configure b/gcc/configure index 66c6a18dd4e..4f9d1dfdfce 100755 --- a/gcc/configure +++ b/gcc/configure @@ -10623,6 +10623,7 @@ saved_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC" for ac_func in getenv atol asprintf sbrk abort atof getcwd getwd \ stpcpy strnlen strsignal strstr strverscmp \ + strtol strtoul strtoll strtoull \ errno snprintf vsnprintf vasprintf malloc realloc calloc \ free basename getopt clock getpagesize ffs clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgetc_unlocked fgets_unlocked fileno_unlocked fprintf_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getchar_unlocked getc_unlocked putchar_unlocked putc_unlocked do @@ -18146,7 +18147,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18149 "configure" +#line 18150 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18252,7 +18253,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18255 "configure" +#line 18256 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 584400dd7d5..2293fb8fc79 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1213,6 +1213,7 @@ saved_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC" gcc_AC_CHECK_DECLS(getenv atol asprintf sbrk abort atof getcwd getwd \ stpcpy strnlen strsignal strstr strverscmp \ + strtol strtoul strtoll strtoull \ errno snprintf vsnprintf vasprintf malloc realloc calloc \ free basename getopt clock getpagesize ffs gcc_UNLOCKED_FUNCS, , ,[ #include "ansidecl.h" diff --git a/libiberty/configure b/libiberty/configure index 4a5e40ab8cc..2007ecc76b1 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -6698,6 +6698,47 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_SBRK $ac_have_decl +_ACEOF + + ac_fn_c_check_decl "$LINENO" "strtol" "ac_cv_have_decl_strtol" "$ac_includes_default" +if test "x$ac_cv_have_decl_strtol" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRTOL $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "strtoul" "ac_cv_have_decl_strtoul" "$ac_includes_default" +if test "x$ac_cv_have_decl_strtoul" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRTOUL $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "strtoll" "ac_cv_have_decl_strtoll" "$ac_includes_default" +if test "x$ac_cv_have_decl_strtoll" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRTOLL $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "strtoull" "ac_cv_have_decl_strtoull" "$ac_includes_default" +if test "x$ac_cv_have_decl_strtoull" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRTOULL $ac_have_decl _ACEOF ac_fn_c_check_decl "$LINENO" "strverscmp" "ac_cv_have_decl_strverscmp" "$ac_includes_default" diff --git a/libiberty/configure.ac b/libiberty/configure.ac index 90adaea1ad2..922aa86e9b0 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -678,6 +678,7 @@ if test -z "${setobjs}"; then AC_CHECK_FUNCS($checkfuncs) AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf]) AC_CHECK_DECLS([calloc, getenv, getopt, malloc, realloc, sbrk]) + AC_CHECK_DECLS([strtol, strtoul, strtoll, strtoull]) AC_CHECK_DECLS([strverscmp]) libiberty_NEED_DECLARATION(canonicalize_file_name) fi -- 2.30.2