diff options
| author | DJ Delorie <dj@redhat.com> | 2010-06-03 16:54:11 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-06-03 16:54:11 +0000 |
| commit | a28030212fd379ffda501ce8010b0811db81291b (patch) | |
| tree | beed8cddb7f9b954db8a1f387a73b3e2b167c8c2 | |
| parent | 84b4420f130fc7c11c63c7319a2059459d6dd4f8 (diff) | |
| download | gdb-a28030212fd379ffda501ce8010b0811db81291b.zip gdb-a28030212fd379ffda501ce8010b0811db81291b.tar.gz gdb-a28030212fd379ffda501ce8010b0811db81291b.tar.bz2 | |
merge from gcc
| -rw-r--r-- | libiberty/ChangeLog | 9 | ||||
| -rwxr-xr-x | libiberty/configure | 22 | ||||
| -rw-r--r-- | libiberty/configure.ac | 4 |
3 files changed, 24 insertions, 11 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 520d5dc..744f6ae 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,4 +1,11 @@ -2ß1ß-05-26 Kai Tietz <kai.tietz@onevision.com> +2010-06-03 Joern Rennecke <joern.rennecke@embecosm.com> + Ralf Wildenhues <Ralf.Wildenhues@gmx.de> + + PR bootstrap/42798 + * configure.ac: Check for declaration of 'basename(char *)'. + * configure: Regenerate. + +2010-05-26 Kai Tietz <kai.tietz@onevision.com> * testsuite/demangle-expected: Add tests for __int128 and unsigned __int128 types. diff --git a/libiberty/configure b/libiberty/configure index 77aeb56..b47bc94 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -1904,8 +1904,10 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else @@ -1915,8 +1917,12 @@ $4 int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -5310,8 +5316,8 @@ _ACEOF fi done - ac_fn_c_check_decl "$LINENO" "basename" "ac_cv_have_decl_basename" "$ac_includes_default" -if test "x$ac_cv_have_decl_basename" = x""yes; then : + ac_fn_c_check_decl "$LINENO" "basename(char *)" "ac_cv_have_decl_basename_char_p_" "$ac_includes_default" +if test "x$ac_cv_have_decl_basename_char_p_" = x""yes; then : ac_have_decl=1 else ac_have_decl=0 @@ -6349,8 +6355,8 @@ _ACEOF fi done - ac_fn_c_check_decl "$LINENO" "basename" "ac_cv_have_decl_basename" "$ac_includes_default" -if test "x$ac_cv_have_decl_basename" = x""yes; then : + ac_fn_c_check_decl "$LINENO" "basename(char *)" "ac_cv_have_decl_basename_char_p_" "$ac_includes_default" +if test "x$ac_cv_have_decl_basename_char_p_" = x""yes; then : ac_have_decl=1 else ac_have_decl=0 diff --git a/libiberty/configure.ac b/libiberty/configure.ac index 515bb33..32ec8d9 100644 --- a/libiberty/configure.ac +++ b/libiberty/configure.ac @@ -379,7 +379,7 @@ if test "x" = "y"; then table times tmpnam \ vasprintf vfprintf vprintf vsprintf \ wait3 wait4 waitpid) - AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf]) + AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf]) AC_DEFINE(HAVE_SYS_ERRLIST, 1, [Define if you have the sys_errlist variable.]) AC_DEFINE(HAVE_SYS_NERR, 1, [Define if you have the sys_nerr variable.]) AC_DEFINE(HAVE_SYS_SIGLIST, 1, [Define if you have the sys_siglist variable.]) @@ -663,7 +663,7 @@ if test -z "${setobjs}"; then [AC_MSG_RESULT([no])]) AC_CHECK_FUNCS($checkfuncs) - AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf]) + AC_CHECK_DECLS([basename(char *), ffs, asprintf, vasprintf, snprintf, vsnprintf]) AC_CHECK_DECLS([calloc, getenv, getopt, malloc, realloc, sbrk]) AC_CHECK_DECLS([strverscmp]) libiberty_NEED_DECLARATION(canonicalize_file_name) |