diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/ChangeLog | 5 | ||||
| -rw-r--r-- | backends/Makefile.am | 7 |
2 files changed, 6 insertions, 6 deletions
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 <[email protected]> + + * Makefile.am: Remove libelf and libdw definitions when MUDFLAP + is defined. Remove libmudflap from LINK line. + 2014-04-09 Mark Wielaard <[email protected]> * 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) |