diff options
| author | Mark Wielaard <mjw@redhat.com> | 2016-11-23 20:51:35 +0100 |
|---|---|---|
| committer | Mark Wielaard <mjw@redhat.com> | 2016-11-23 20:51:35 +0100 |
| commit | ee225020a880e41cd4007af09ae488bc9cf1a536 (patch) | |
| tree | fa6debf30bbcb9424bda0126d48d71eb9c9292d6 | |
| parent | 507e7e28f0f58cb711a7b3e5bb320c5f30b0e6ea (diff) | |
| download | elfutils-ee225020a880e41cd4007af09ae488bc9cf1a536.tar.gz | |
Only workaround fts.h if we have a bad version that doesn't handle LFS.
Older versions of glibc included an fts implementation that didn't have
Large File System support. We worked around that in linux-kernel-modules.c
by including it early before config.h and then redefining some symbols
to get the 64-bit versions. This is somewhat fragile and not necessary
with newer glibc. If possible we want the 64bit fts version always.
Signed-off-by: Mark Wielaard <mjw@redhat.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | libdwfl/ChangeLog | 7 | ||||
| -rw-r--r-- | libdwfl/linux-kernel-modules.c | 20 |
4 files changed, 33 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2016-11-23 Mark Wielaard <mjw@redhat.com> + + * configure.ac: Add test for bad fts.h. Add -DBAD_FTS=1 to CFLAGS + if necessary. + 2016-11-02 Mark Wielaard <mjw@redhat.com> * configure.ac: Add check for whether gcc accepts diff --git a/configure.ac b/configure.ac index c55fb9b4..f5351237 100644 --- a/configure.ac +++ b/configure.ac @@ -144,6 +144,15 @@ dnl tests, because the choice of the file model can (in principle) affect dnl whether functions and headers are available, whether they work, etc. AC_SYS_LARGEFILE +dnl Older glibc had a broken fts that didn't work with Large File Systems. +dnl We want the version that can handler LFS, but include workaround if we +dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to +dnl check it before including config.h (which might define _FILE_OFFSET_BITS). +AC_CACHE_CHECK([whether fts.h is bad when included (with LFS)], ac_cv_bad_fts, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <fts.h>]])], + ac_cv_bad_fts=no, ac_cv_bad_fts=yes)]) +AS_IF([test "x$ac_cv_bad_fts" = "xyes"], [CFLAGS="$CFLAGS -DBAD_FTS=1"]) + dnl enable debugging of branch prediction. AC_ARG_ENABLE([debugpred], AS_HELP_STRING([--enable-debugpred],[build binaries with support to debug branch prediction]), diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 27c5d6ef..bc627fee 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,4 +1,9 @@ -2015-10-11 Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> +2016-11-23 Mark Wielaard <mjw@redhat.com> + + * linux-kernel-modules.c: Only include fts.h early if BAD_FTS is + defined. + +2016-10-11 Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> * core-file.c: Remove sys/param.h. * dwfl_segment_report_module.c: Likewise. Add system.h include. diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c index 54c0b908..9cd8ea93 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -26,10 +26,12 @@ the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* We include this before config.h because it can't handle _FILE_OFFSET_BITS. +/* In case we have a bad fts we include this before config.h because it + can't handle _FILE_OFFSET_BITS. Everything we need here is fine if its declarations just come first. */ - -#include <fts.h> +#ifdef BAD_FTS + #include <fts.h> +#endif #include <config.h> @@ -44,11 +46,15 @@ #include <fcntl.h> #include <unistd.h> -/* Since fts.h is included before config.h, its indirect inclusions may not +/* If fts.h is included before config.h, its indirect inclusions may not give us the right LFS aliases of these functions, so map them manually. */ -#ifdef _FILE_OFFSET_BITS -#define open open64 -#define fopen fopen64 +#ifdef BAD_FTS + #ifdef _FILE_OFFSET_BITS + #define open open64 + #define fopen fopen64 + #endif +#else + #include <fts.h> #endif |