diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | backends/ChangeLog | 5 | ||||
-rw-r--r-- | backends/Makefile.am | 7 | ||||
-rw-r--r-- | config/ChangeLog | 5 | ||||
-rw-r--r-- | config/eu.am | 10 | ||||
-rw-r--r-- | configure.ac | 22 | ||||
-rw-r--r-- | libasm/ChangeLog | 4 | ||||
-rw-r--r-- | libasm/Makefile.am | 6 | ||||
-rw-r--r-- | libcpu/ChangeLog | 4 | ||||
-rw-r--r-- | libcpu/Makefile.am | 2 | ||||
-rw-r--r-- | libdw/ChangeLog | 4 | ||||
-rw-r--r-- | libdw/Makefile.am | 6 | ||||
-rw-r--r-- | libdwfl/ChangeLog | 6 | ||||
-rw-r--r-- | libdwfl/Makefile.am | 10 | ||||
-rw-r--r-- | libdwfl/argp-std.c | 12 | ||||
-rw-r--r-- | libelf/ChangeLog | 7 | ||||
-rw-r--r-- | libelf/Makefile.am | 6 | ||||
-rw-r--r-- | libelf/elf_begin.c | 5 | ||||
-rw-r--r-- | libelf/elf_update.c | 4 | ||||
-rw-r--r-- | src/ChangeLog | 6 | ||||
-rw-r--r-- | src/Makefile.am | 33 | ||||
-rw-r--r-- | src/strings.c | 8 | ||||
-rw-r--r-- | tests/ChangeLog | 6 | ||||
-rw-r--r-- | tests/Makefile.am | 138 | ||||
-rw-r--r-- | tests/configure.ac | 1 |
25 files changed, 138 insertions, 183 deletions
@@ -1,3 +1,7 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * configure.ac: Remove mudflap enable arg and MUDFLAP conditional. + 2014-01-21 Mark Wielaard <mjw@redhat.com> * NEWS (Version 0.159): Add stack -i. diff --git a/backends/ChangeLog b/backends/ChangeLog index bfe23019..94290b7c 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,8 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * Makefile.am: Remove libelf and libdw definitions when MUDFLAP + is defined. Remove libmudflap from LINK line. + 2014-04-09 Mark Wielaard <mjw@redhat.com> * Makefile.am (aarch64_SRCS): Add aarch64_initreg.c. diff --git a/backends/Makefile.am b/backends/Makefile.am index 49593ac0..e06841c0 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -42,13 +42,8 @@ noinst_LIBRARIES = $(libebl_pic) noinst_DATA = $(libebl_pic:_pic.a=.so) -if MUDFLAP -libelf = ../libelf/libelf.a -libdw = ../libdw/libdw.a -else libelf = ../libelf/libelf.so libdw = ../libdw/libdw.so -endif i386_SRCS = i386_init.c i386_symbol.c i386_corenote.c i386_cfi.c \ i386_retval.c i386_regs.c i386_auxv.c i386_syscall.c \ @@ -124,7 +119,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw) $(LINK) -shared -o $(@:.map=.so) \ -Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \ -Wl,--version-script,$(@:.so=.map) \ - -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(libmudflap) + -Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw) $(textrel_check) libebl_i386.so: $(cpu_i386) diff --git a/config/ChangeLog b/config/ChangeLog index 0fca489a..c2af732e 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * eu.am (AM_CFLAGS): Don't add -fmudflap. + (COMPILE.os): Don't remove no_mudflap.os. + 2014-01-22 Mark Wielaard <mjw@redhat.com> * eu.am (AM_CFLAGS): Unconditionally add -Wformat=2. diff --git a/config/eu.am b/config/eu.am index d2b4e795..c3b00e08 100644 --- a/config/eu.am +++ b/config/eu.am @@ -36,15 +36,7 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $($(*F)_CFLAGS) -if MUDFLAP -AM_CFLAGS += -fmudflap -libmudflap = -lmudflap -else -libmudflap = -endif - -COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage $(no_mudflap.os),\ - $(COMPILE)) +COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE)) %.os: %.c %.o if AMDEP diff --git a/configure.ac b/configure.ac index 7bfa1da2..e678ca34 100644 --- a/configure.ac +++ b/configure.ac @@ -151,26 +151,6 @@ dnl Support to work around automake's inflexible dependency generation. dnl See src/Makefile.am for more information. AM_CONDITIONAL(NEVER, false) -dnl Enable debugging via mudflap. This option will cause most libraries -dnl to be built as archives which are statically linked into the applications. -dnl All code, as far as possible, is compiled instrumented to catch all -dnl the bugs valgrind is able to catch. -use_mudflap=no -AC_ARG_ENABLE([mudflap], -AS_HELP_STRING([--enable-mudflap], -[build binaries with mudflap instrumentation]), [dnl -if test "x$enable_mudflap" = xyes; then - # Check whether the compiler support -fmudflap. - old_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fmudflap" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[use_mudflap=yes],[use_mudflap=fail]) - CFLAGS="$old_CFLAGS" -fi]) -if test "$use_mudflap" = fail; then - AC_MSG_FAILURE([--enable-mudflap requires a compiler which understands this option]) -fi -AM_CONDITIONAL(MUDFLAP, test "$use_mudflap" = yes) - dnl enable debugging of branch prediction. AC_ARG_ENABLE([debugpred], AS_HELP_STRING([--enable-debugpred],[build binaries with support to debug branch prediction]), @@ -211,7 +191,7 @@ fi AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes) AM_CONDITIONAL(BUILD_STATIC, [dnl -test "$use_mudflap" = yes -o "$use_gprof" = yes -o "$use_gcov" = yes]) +test "$use_gprof" = yes -o "$use_gcov" = yes]) AC_ARG_ENABLE([tests-rpath], AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]), diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 1afc3421..2613610f 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,7 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * Makefile.am: Remove !MUDFLAP conditions. + 2013-04-24 Mark Wielaard <mjw@redhat.com> * Makefile.am: Use AM_CPPFLAGS instead of INCLUDES. diff --git a/libasm/Makefile.am b/libasm/Makefile.am index 4d81536b..3d6a2e58 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -34,10 +34,8 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 lib_LIBRARIES = libasm.a -if !MUDFLAP noinst_LIBRARIES = libasm_pic.a noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so) -endif pkginclude_HEADERS = libasm.h libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ @@ -54,7 +52,6 @@ libasm_a_SOURCES = asm_begin.c asm_abort.c asm_end.c asm_error.c \ disasm_begin.c disasm_cb.c disasm_end.c disasm_str.c \ symbolhash.c -if !MUDFLAP libasm_pic_a_SOURCES = am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) @@ -64,7 +61,7 @@ libasm_so_LDLIBS += -lpthread endif libasm_so_SOURCES = -libasm.so: libasm_pic.a libasm.map +libasm.so$(EXEEXT): libasm_pic.a libasm.map $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \ -Wl,--soname,$@.$(VERSION) \ @@ -83,7 +80,6 @@ uninstall: uninstall-am rm -f $(DESTDIR)$(libdir)/libasm.so.$(VERSION) rm -f $(DESTDIR)$(libdir)/libasm.so rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils -endif noinst_HEADERS = libasmP.h symbolhash.h EXTRA_DIST = libasm.map diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog index ef9d7754..a20f4407 100644 --- a/libcpu/ChangeLog +++ b/libcpu/ChangeLog @@ -1,3 +1,7 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * Makefile.am (i386_gendis_LDADD): Remove libmudflap. + 2013-04-24 Mark Wielaard <mjw@redhat.com> * Makefile.am: Use AM_CPPFLAGS instead of INCLUDES. diff --git a/libcpu/Makefile.am b/libcpu/Makefile.am index 13e36714..3beccf34 100644 --- a/libcpu/Makefile.am +++ b/libcpu/Makefile.am @@ -78,7 +78,7 @@ i386_lex_CFLAGS = -Wno-unused-label -Wno-unused-function -Wno-sign-compare i386_parse.o: i386_parse.c i386.mnemonics i386_parse_CFLAGS = -DNMNES="`wc -l < i386.mnemonics`" i386_lex.o: i386_parse.h -i386_gendis_LDADD = $(libeu) -lm $(libmudflap) +i386_gendis_LDADD = $(libeu) -lm i386_parse.h: i386_parse.c ; diff --git a/libdw/ChangeLog b/libdw/ChangeLog index e8f0eb88..49d70af4 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * Makefile.am: Remove !MUDFLAP conditions. + 2014-04-09 Mark Wielaard <mjw@redhat.com> * dwarf_begin_elf.c (check_section): Check for unsigned overflow diff --git a/libdw/Makefile.am b/libdw/Makefile.am index cd9e3143..4e2f8587 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -35,10 +35,8 @@ AM_CPPFLAGS += -I$(srcdir)/../libelf VERSION = 1 lib_LIBRARIES = libdw.a -if !MUDFLAP noinst_LIBRARIES = libdw_pic.a noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so) -endif include_HEADERS = dwarf.h pkginclude_HEADERS = libdw.h @@ -97,12 +95,11 @@ $(srcdir)/known-dwarf.h: $(top_srcdir)/config/known-dwarf.awk $(srcdir)/dwarf.h mv -f $@.new $@ endif -if !MUDFLAP libdw_pic_a_SOURCES = am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) libdw_so_SOURCES = -libdw.so: $(srcdir)/libdw.map libdw_pic.a \ +libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a \ ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \ ../libelf/libelf.so # The rpath is necessary for libebl because its $ORIGIN use will @@ -126,7 +123,6 @@ uninstall: uninstall-am rm -f $(DESTDIR)$(libdir)/libdw.so.$(VERSION) rm -f $(DESTDIR)$(libdir)/libdw.so rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils -endif libdwfl_objects = $(shell $(AR) t ../libdwfl/libdwfl.a) libdw_a_LIBADD = $(addprefix ../libdwfl/,$(libdwfl_objects)) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index b6a9161e..e93d50c0 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,9 @@ +2014-03-14 Mark Wielaard <mjw@redhat.com> + + * Makefile.am: Remove !MUDFLAP and MUDFLAP conditions. + Remove libelf and libdw definitions when MUDFLAP is defined. + * argp-std.c (__libdwfl_argp_mudflap_options): Removed. + 2014-03-03 Mark Wielaard <mjw@redhat.com> * elf-from-memory.c (elf_from_remote_memory): Keep track of diff --git a/libdwfl/Makefile.am b/libdwfl/Makefile.am index ce590dac..aa504eba 100644 --- a/libdwfl/Makefile.am +++ b/libdwfl/Makefile.am @@ -35,9 +35,7 @@ AM_CPPFLAGS += -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ VERSION = 1 noinst_LIBRARIES = libdwfl.a -if !MUDFLAP noinst_LIBRARIES += libdwfl_pic.a -endif pkginclude_HEADERS = libdwfl.h @@ -82,22 +80,14 @@ if LZMA libdwfl_a_SOURCES += lzma.c endif -if MUDFLAP -libdwfl = libdwfl.a $(libdw) $(libebl) $(libelf) $(libeu) -libdw = ../libdw/libdw.a -libelf = ../libelf/libelf.a -else libdwfl = $(libdw) libdw = ../libdw/libdw.so libelf = ../libelf/libelf.so -endif libebl = ../libebl/libebl.a libeu = ../lib/libeu.a -if !MUDFLAP libdwfl_pic_a_SOURCES = am_libdwfl_pic_a_OBJECTS = $(libdwfl_a_SOURCES:.c=.os) -endif noinst_HEADERS = libdwflP.h diff --git a/libdwfl/argp-std.c b/libdwfl/argp-std.c index 3a2d2a59..8d2bc6aa 100644 --- a/libdwfl/argp-std.c +++ b/libdwfl/argp-std.c @@ -365,15 +365,3 @@ dwfl_standard_argp (void) { return &libdwfl_argp; } - -#ifdef _MUDFLAP -/* In the absence of a mudflap wrapper for argp_parse, or a libc compiled - with -fmudflap, we'll see spurious errors for using the struct argp_state - on argp_parse's stack. */ - -void __attribute__ ((constructor)) -__libdwfl_argp_mudflap_options (void) -{ - __mf_set_options ("-heur-stack-bound"); -} -#endif diff --git a/libelf/ChangeLog b/libelf/ChangeLog index c67443b1..bd009cd9 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,10 @@ +2014-04-13 Mark Wielaard <mjw@redhat.com> + + * Makefile.am: Remove !MUDFLAP conditions. + * elf_begin.c (read_file): Don't clear use_mmap when _MUDFLAP is + defined. + * elf_update.c (write_file): Remove _MUDFLAP condition. + 2014-01-17 Jakub Jelinek <jakub@redhat.com> Roland McGrath <roland@redhat.com> diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 4646fbae..493e4ec1 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -35,10 +35,8 @@ GCC_INCLUDE = -I$(shell $(CC) -print-file-name=include) VERSION = 1 lib_LIBRARIES = libelf.a -if !MUDFLAP noinst_LIBRARIES = libelf_pic.a noinst_PROGRAMS = $(noinst_LIBRARIES:_pic.a=.so) -endif include_HEADERS = libelf.h gelf.h nlist.h pkginclude_HEADERS = elf-knowledge.h @@ -92,7 +90,6 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ elf_gnu_hash.c \ elf_scnshndx.c -if !MUDFLAP libelf_pic_a_SOURCES = am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) @@ -102,7 +99,7 @@ libelf_so_LDLIBS += -lpthread endif libelf_so_SOURCES = -libelf.so: libelf_pic.a libelf.map +libelf.so$(EXEEXT): libelf_pic.a libelf.map $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \ -Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS) @@ -119,7 +116,6 @@ uninstall: uninstall-am rm -f $(DESTDIR)$(libdir)/libelf-$(PACKAGE_VERSION).so rm -f $(DESTDIR)$(libdir)/libelf.so.$(VERSION) rm -f $(DESTDIR)$(libdir)/libelf.so -endif noinst_HEADERS = elf.h abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c index a592fbf7..1ef70ac3 100644 --- a/libelf/elf_begin.c +++ b/libelf/elf_begin.c @@ -591,11 +591,6 @@ read_file (int fildes, off_t offset, size_t maxsize, || cmd == ELF_C_WRITE_MMAP || cmd == ELF_C_READ_MMAP_PRIVATE); -#if _MUDFLAP - /* Mudflap doesn't grok that our mmap'd data is ok. */ - use_mmap = 0; -#endif - if (use_mmap) { if (parent == NULL) diff --git a/libelf/elf_update.c b/libelf/elf_update.c index 31ba2537..54c20f50 100644 --- a/libelf/elf_update.c +++ b/libelf/elf_update.c @@ -69,14 +69,10 @@ write_file (Elf *elf, off_t size, int change_bo, size_t shnum) /* Try to map the file if this isn't done yet. */ if (elf->map_address == NULL && elf->cmd == ELF_C_WRITE_MMAP) { -#if _MUDFLAP - /* Mudflap doesn't grok that our mmap'd data is ok. */ -#else elf->map_address = mmap (NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, elf->fildes, 0); if (unlikely (elf->map_address == MAP_FAILED)) elf->map_address = NULL; -#endif } if (elf->map_address != NULL) 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 <mjw@redhat.com> + + * Makefile.am: Remove no_mudflap.os. Remove libmudflap from all + LDADD lines. + * strings.c (process_chunk): Remove _MUDFLAP condition. + 2014-04-09 Mark Wielaard <mjw@redhat.com> * 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 } diff --git a/tests/ChangeLog b/tests/ChangeLog index 1852162e..afec07fb 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,9 @@ +2014-03-14 Mark Wielaard <mjw@redhat.com> + + * Makefile.am: Remove MUDFLAP conditions. Remove libmudflap from all + LDADD lines. + * configure.ac: Remove MUDFLAP conditional. + 2014-04-09 Mark Wielaard <mjw@redhat.com> * run-readelf-zdebug.sh: New test. diff --git a/tests/Makefile.am b/tests/Makefile.am index 44fa5e98..1a9ee750 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,11 +17,7 @@ ## along with this program. If not, see <http://www.gnu.org/licenses/>. ## include $(top_srcdir)/config/eu.am -if MUDFLAP -BUILD_RPATH = \$$ORIGIN/../backends -else BUILD_RPATH = \$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../backends:\$$ORIGIN/../libelf -endif AM_LDFLAGS = @@ -316,10 +312,6 @@ installcheck-local: LOG_COMPILER="$(installed_LOG_COMPILER)" check-TESTS endif !STANDALONE -if MUDFLAP -static_build = yes -endif - if STANDALONE libdw = -ldw libelf = -lelf @@ -339,77 +331,77 @@ libebl = ../libebl/libebl.a libeu = ../lib/libeu.a endif !STANDALONE -arextract_LDADD = $(libelf) $(libmudflap) -arsymtest_LDADD = $(libelf) $(libmudflap) -newfile_LDADD = $(libelf) $(libmudflap) -saridx_LDADD = $(libelf) $(libmudflap) -scnnames_LDADD = $(libelf) $(libmudflap) -sectiondump_LDADD = $(libelf) $(libmudflap) -showptable_LDADD = $(libelf) $(libmudflap) -hash_LDADD = $(libelf) $(libmudflap) -test_nlist_LDADD = $(libelf) $(libmudflap) -msg_tst_LDADD = $(libelf) $(libmudflap) -newscn_LDADD = $(libelf) $(libmudflap) -early_offscn_LDADD = $(libelf) $(libmudflap) -ecp_LDADD = $(libelf) $(libmudflap) -update1_LDADD = $(libelf) $(libmudflap) -update2_LDADD = $(libelf) $(libmudflap) -update3_LDADD = $(libebl) $(libelf) $(libmudflap) -update4_LDADD = $(libebl) $(libelf) $(libmudflap) -show_die_info_LDADD = $(libdw) $(libelf) $(libmudflap) -get_pubnames_LDADD = $(libdw) $(libelf) $(libmudflap) -show_abbrev_LDADD = $(libdw) $(libelf) $(libmudflap) -get_lines_LDADD = $(libdw) $(libelf) $(libmudflap) -get_files_LDADD = $(libdw) $(libelf) $(libmudflap) -get_aranges_LDADD = $(libdw) $(libelf) $(libmudflap) -allfcts_LDADD = $(libdw) $(libelf) $(libmudflap) -line2addr_LDADD = $(libdw) $(libmudflap) -addrscopes_LDADD = $(libdw) $(libmudflap) -funcscopes_LDADD = $(libdw) $(libmudflap) -funcretval_LDADD = $(libdw) $(libmudflap) -allregs_LDADD = $(libdw) $(libmudflap) -find_prologues_LDADD = $(libdw) $(libmudflap) -#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) $(libmudflap) -asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl -dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -rdwrmmap_LDADD = $(libelf) $(libmudflap) -dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -arls_LDADD = $(libelf) $(libmudflap) -dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -dwarf_getmacros_LDADD = $(libdw) $(libmudflap) -dwarf_getstring_LDADD = $(libdw) $(libmudflap) -addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl -test_flag_nobits_LDADD = $(libelf) $(libmudflap) -rerequest_tag_LDADD = $(libdw) $(libmudflap) -alldts_LDADD = $(libebl) $(libelf) $(libmudflap) +arextract_LDADD = $(libelf) +arsymtest_LDADD = $(libelf) +newfile_LDADD = $(libelf) +saridx_LDADD = $(libelf) +scnnames_LDADD = $(libelf) +sectiondump_LDADD = $(libelf) +showptable_LDADD = $(libelf) +hash_LDADD = $(libelf) +test_nlist_LDADD = $(libelf) +msg_tst_LDADD = $(libelf) +newscn_LDADD = $(libelf) +early_offscn_LDADD = $(libelf) +ecp_LDADD = $(libelf) +update1_LDADD = $(libelf) +update2_LDADD = $(libelf) +update3_LDADD = $(libebl) $(libelf) +update4_LDADD = $(libebl) $(libelf) +show_die_info_LDADD = $(libdw) $(libelf) +get_pubnames_LDADD = $(libdw) $(libelf) +show_abbrev_LDADD = $(libdw) $(libelf) +get_lines_LDADD = $(libdw) $(libelf) +get_files_LDADD = $(libdw) $(libelf) +get_aranges_LDADD = $(libdw) $(libelf) +allfcts_LDADD = $(libdw) $(libelf) +line2addr_LDADD = $(libdw) +addrscopes_LDADD = $(libdw) +funcscopes_LDADD = $(libdw) +funcretval_LDADD = $(libdw) +allregs_LDADD = $(libdw) +find_prologues_LDADD = $(libdw) +#show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) +asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) -ldl +asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) -ldl +dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) -ldl +rdwrmmap_LDADD = $(libelf) +dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) -ldl +arls_LDADD = $(libelf) +dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) -ldl +dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) -ldl +dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) -ldl +dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) -ldl +dwarf_getmacros_LDADD = $(libdw) +dwarf_getstring_LDADD = $(libdw) +addrcfi_LDADD = $(libdw) $(libebl) $(libelf) -ldl +test_flag_nobits_LDADD = $(libelf) +rerequest_tag_LDADD = $(libdw) +alldts_LDADD = $(libebl) $(libelf) md5_sha1_test_LDADD = $(libeu) -typeiter_LDADD = $(libdw) $(libelf) $(libmudflap) -typeiter2_LDADD = $(libdw) $(libelf) $(libmudflap) -low_high_pc_LDADD = $(libdw) $(libelf) $(libmudflap) -test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libmudflap) -dwflsyms_LDADD = $(libdw) $(libelf) $(libmudflap) -dwfllines_LDADD = $(libdw) $(libelf) $(libmudflap) -dwfl_report_elf_align_LDADD = $(libdw) $(libmudflap) -varlocs_LDADD = $(libdw) $(libelf) $(libmudflap) -backtrace_LDADD = $(libdw) $(libelf) $(libmudflap) +typeiter_LDADD = $(libdw) $(libelf) +typeiter2_LDADD = $(libdw) $(libelf) +low_high_pc_LDADD = $(libdw) $(libelf) +test_elf_cntl_gelf_getshdr_LDADD = $(libelf) +dwflsyms_LDADD = $(libdw) $(libelf) +dwfllines_LDADD = $(libdw) $(libelf) +dwfl_report_elf_align_LDADD = $(libdw) +varlocs_LDADD = $(libdw) $(libelf) +backtrace_LDADD = $(libdw) $(libelf) # backtrace-child-biarch also uses those *_CFLAGS and *_LDLAGS variables: backtrace_child_CFLAGS = -fPIE backtrace_child_LDFLAGS = -pie -pthread backtrace_child_biarch_SOURCES = backtrace-child.c -backtrace_data_LDADD = $(libdw) $(libelf) $(libmudflap) +backtrace_data_LDADD = $(libdw) $(libelf) backtrace_dwarf_CFLAGS = -Wno-unused-parameter -backtrace_dwarf_LDADD = $(libdw) $(libelf) $(libmudflap) +backtrace_dwarf_LDADD = $(libdw) $(libelf) if GCOV check: check-am coverage diff --git a/tests/configure.ac b/tests/configure.ac index c0dbd7c8..ed51920a 100644 --- a/tests/configure.ac +++ b/tests/configure.ac @@ -50,7 +50,6 @@ AM_CONDITIONAL(HAVE_LIBASM, [test $have_libasm = yes]) AM_CONDITIONAL(STANDALONE, true) AM_CONDITIONAL(BUILD_STATIC, false) AM_CONDITIONAL(TESTS_RPATH, false) -AM_CONDITIONAL(MUDFLAP, false) AM_CONDITIONAL(GCOV, false) dnl Text of the config.h file. |