Commit a2a5609b by Kai Tietz Committed by Kai Tietz

re PR libgcc/65038 ([regression 5] Unable to find ftw.h for libgcov-util.c)

	PR target/65038
	* config.in: Regenerated.
	* configure: Likewise.
	* configure.ac (AC_HEADER_STDC): Add explicit.
	(AC_CHECK_HEADERS): Check for default headers
	plus for ftw.h one.
	* libgcov-util.c (gcov_read_profile_dir): Disable use
	of ftw-function, if header not found.
	(ftw_read_file): Don't translate if ftw header isn't
	present.

From-SVN: r221055
parent d1783ae5
2015-02-27 Kai Tietz <ktietz@redhat.com>
PR target/65038
* config.in: Regenerated.
* configure: Likewise.
* configure.ac (AC_HEADER_STDC): Add explicit.
(AC_CHECK_HEADERS): Check for default headers
plus for ftw.h one.
* libgcov-util.c (gcov_read_profile_dir): Disable use
of ftw-function, if header not found.
(ftw_read_file): Don't translate if ftw header isn't
present.
2015-02-23 Thomas Schwinge <thomas@codesourcery.com> 2015-02-23 Thomas Schwinge <thomas@codesourcery.com>
PR target/65181 PR target/65181
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
/* Define to 1 if the target assembler supports thread-local storage. */ /* Define to 1 if the target assembler supports thread-local storage. */
#undef HAVE_CC_TLS #undef HAVE_CC_TLS
/* Define to 1 if you have the <ftw.h> header file. */
#undef HAVE_FTW_H
/* Define if _Unwind_GetIPInfo is available. */ /* Define if _Unwind_GetIPInfo is available. */
#undef HAVE_GETIPINFO #undef HAVE_GETIPINFO
......
...@@ -47,6 +47,12 @@ AC_SUBST(libgcc_topdir) ...@@ -47,6 +47,12 @@ AC_SUBST(libgcc_topdir)
AC_CONFIG_AUX_DIR($libgcc_topdir) AC_CONFIG_AUX_DIR($libgcc_topdir)
AC_CONFIG_HEADER(auto-target.h:config.in) AC_CONFIG_HEADER(auto-target.h:config.in)
AC_CHECK_HEADERS(inttypes.h \
stdint.h stdlib.h \
ftw.h unistd.h sys/stat.h sys/types.h \
string.h strings.h memory.h)
AC_HEADER_STDC
AC_ARG_ENABLE(shared, AC_ARG_ENABLE(shared,
[ --disable-shared don't provide a shared libgcc], [ --disable-shared don't provide a shared libgcc],
[ [
......
...@@ -52,7 +52,9 @@ void gcov_set_verbose (void) ...@@ -52,7 +52,9 @@ void gcov_set_verbose (void)
#include "obstack.h" #include "obstack.h"
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_FTW_H
#include <ftw.h> #include <ftw.h>
#endif
static void tag_function (unsigned, unsigned); static void tag_function (unsigned, unsigned);
static void tag_blocks (unsigned, unsigned); static void tag_blocks (unsigned, unsigned);
...@@ -380,6 +382,7 @@ read_gcda_file (const char *filename) ...@@ -380,6 +382,7 @@ read_gcda_file (const char *filename)
return obj_info; return obj_info;
} }
#ifdef HAVE_FTW_H
/* This will be called by ftw(). It opens and read a gcda file FILENAME. /* This will be called by ftw(). It opens and read a gcda file FILENAME.
Return a non-zero value to stop the tree walk. */ Return a non-zero value to stop the tree walk. */
...@@ -417,6 +420,7 @@ ftw_read_file (const char *filename, ...@@ -417,6 +420,7 @@ ftw_read_file (const char *filename,
return 0; return 0;
} }
#endif
/* Initializer for reading a profile dir. */ /* Initializer for reading a profile dir. */
...@@ -451,7 +455,9 @@ gcov_read_profile_dir (const char* dir_name, int recompute_summary ATTRIBUTE_UNU ...@@ -451,7 +455,9 @@ gcov_read_profile_dir (const char* dir_name, int recompute_summary ATTRIBUTE_UNU
fnotice (stderr, "%s is not a directory\n", dir_name); fnotice (stderr, "%s is not a directory\n", dir_name);
return NULL; return NULL;
} }
#ifdef HAVE_FTW_H
ftw (".", ftw_read_file, 50); ftw (".", ftw_read_file, 50);
#endif
ret = chdir (pwd); ret = chdir (pwd);
free (pwd); free (pwd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment