diff options
| author | Mark Wielaard <[email protected]> | 2014-04-13 17:39:57 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2014-04-18 11:46:51 +0200 |
| commit | 3232479483cad695d1872b879128a23da3953a7d (patch) | |
| tree | 775fd4f2dc1620baa75c96e7d1e73fb882b57671 /libelf | |
| parent | f7cdc74ed34adc539186385342d99b357c3dbb6b (diff) | |
Remove mudflap build option.
The --enable-mudflap configure build has been broken for 2 years without
anybody apparently noticing. GCC 4.9 removed mudflap support. Before
release we now run make distcheck with valgrind support. Removal of the
mudflap configure option simplifies the build a little.
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'libelf')
| -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 |
4 files changed, 8 insertions, 14 deletions
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 <[email protected]> + + * 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 <[email protected]> Roland McGrath <[email protected]> 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) |