diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 33 | ||||
| -rw-r--r-- | src/strings.c | 8 |
3 files changed, 21 insertions, 26 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2844daf6..5eb69d60 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-03-13 Mark Wielaard <[email protected]> + + * Makefile.am: Remove no_mudflap.os. Remove libmudflap from all + LDADD lines. + * strings.c (process_chunk): Remove _MUDFLAP condition. + 2014-04-09 Mark Wielaard <[email protected]> * readelf.c (print_debug_aranges_section): Don't get the raw section diff --git a/src/Makefile.am b/src/Makefile.am index e3711608..43909cab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,8 +25,6 @@ AM_CPPFLAGS += -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw -no_mudflap.os = -fmudflap - YACC = @YACC@ -d AM_YFLAGS = -pld AM_LFLAGS = -Pld -olex.yy.c @@ -91,28 +89,27 @@ endif # XXX While the file is not finished, don't warn about this ldgeneric_no_Wunused = yes -readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \ +readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl +nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \ $(demanglelib) -size_LDADD = $(libelf) $(libeu) $(libmudflap) -strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl +size_LDADD = $(libelf) $(libeu) +strip_LDADD = $(libebl) $(libelf) $(libeu) -ldl +ld_LDADD = $(libebl) $(libelf) $(libeu) -ldl if NATIVE_LD # -ldl is always needed for libebl. ld_LDADD += libld_elf.a endif ld_LDFLAGS = -rdynamic -elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) -addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) -elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl -objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl -ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -strings_LDADD = $(libelf) $(libeu) $(libmudflap) -ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) -unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl -stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \ - $(demanglelib) +elflint_LDADD = $(libebl) $(libelf) $(libeu) -ldl +findtextrel_LDADD = $(libdw) $(libelf) +addr2line_LDADD = $(libdw) $(libelf) +elfcmp_LDADD = $(libebl) $(libelf) -ldl +objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) -ldl +ranlib_LDADD = libar.a $(libelf) $(libeu) +strings_LDADD = $(libelf) $(libeu) +ar_LDADD = libar.a $(libelf) $(libeu) +unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl +stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) -ldl $(demanglelib) ldlex.o: ldscript.c ldlex_no_Werror = yes diff --git a/src/strings.c b/src/strings.c index 37210a74..f60e4b4d 100644 --- a/src/strings.c +++ b/src/strings.c @@ -465,13 +465,6 @@ process_chunk (const char *fname, const unsigned char *buf, off64_t to, static void * map_file (int fd, off64_t start_off, off64_t fdlen, size_t *map_sizep) { -#if _MUDFLAP - (void) fd; - (void) start_off; - (void) fdlen; - (void) map_sizep; - return MAP_FAILED; -#else /* Maximum size we mmap. We use an #ifdef to avoid overflows on 32-bit machines. 64-bit machines these days do not have usable address spaces larger than about 43 bits. Not that any file @@ -513,7 +506,6 @@ map_file (int fd, off64_t start_off, off64_t fdlen, size_t *map_sizep) *map_sizep = map_size; return mem; -#endif } |