diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2015-11-03 13:36:27 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2015-11-03 13:36:27 -0800 |
| commit | dc3cf77bb4a63100e588d7399f25f1a17c12e5b0 (patch) | |
| tree | 20e8c75e7378fdde20c2238af1dc945c070a35b8 /libelf | |
| parent | 73bfc166d0882d6807981191e8307c56807ec54f (diff) | |
| parent | ae09ca9af1eefdbc17ed1d2e95c0c244ea27a798 (diff) | |
| download | android_external_elfutils-dc3cf77bb4a63100e588d7399f25f1a17c12e5b0.tar.gz android_external_elfutils-dc3cf77bb4a63100e588d7399f25f1a17c12e5b0.tar.bz2 android_external_elfutils-dc3cf77bb4a63100e588d7399f25f1a17c12e5b0.zip | |
Merge upstream SHA 'ae09ca9'
* git merge ae09ca9
* See all upstream changes since the previous merge:
git diff 5eb3e90..ae09ca9
* Android relevant upstream changes:
Move nested functions to file scope:
backends/ia64_retval.c, aarch64_regs.c
libdwfl/frame_unwind.c, dwfl_module.c
* Other upstream changes unrelated to Android:
Make zlib mandatory.
* No changes to the following generated files:
version.h, config.h, libdw/known-dwarf.h
Diffstat (limited to 'libelf')
| -rw-r--r-- | libelf/ChangeLog | 4 | ||||
| -rw-r--r-- | libelf/Makefile.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog index 18d77974..fbe8e3ae 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,7 @@ +2015-10-16 Mark Wielaard <mjw@redhat.com> + + * Makefile.am (libelf_so_LDLIBS): Add -lz. + 2015-10-14 Mark Wielaard <mjw@redhat.com> * elf.h: Update from glibc. Add section compression constants and diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 91a7d073..4a4131c1 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -93,7 +93,7 @@ libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ libelf_pic_a_SOURCES = am_libelf_pic_a_OBJECTS = $(libelf_a_SOURCES:.c=.os) -libelf_so_LDLIBS = +libelf_so_LDLIBS = -lz if USE_LOCKS libelf_so_LDLIBS += -lpthread endif |