diff options
| author | Roland McGrath <roland@redhat.com> | 2008-12-04 06:28:06 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2008-12-04 06:28:06 +0000 |
| commit | 12af5a2882bf23f3f2b55d78ef2ea568bac120de (patch) | |
| tree | 686a3f6ae8733a2a7bafb73228aec88a02071098 | |
| parent | 02f66452635df3d01f7e57845c3362ab828e3d89 (diff) | |
| download | elfutils-12af5a2882bf23f3f2b55d78ef2ea568bac120de.tar.gz | |
merge of '4c5dbb5e116d9a9c7f9014a3dcbabba8e7d89327'
and 'fddaff07d3c095a3d26f41fe7a7da147c024bd96'
| -rw-r--r-- | libasm/ChangeLog | 4 | ||||
| -rw-r--r-- | libasm/Makefile.am | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libasm/ChangeLog b/libasm/ChangeLog index 2894970e..c98deb64 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,7 @@ +2008-12-03 Ulrich Drepper <drepper@redhat.com> + + * Makefile.am [USE_TLS]: Like libasm.so with libpthread. + 2008-01-11 Ulrich Drepper <drepper@redhat.com> * libasm.h (DisasmGetSymCB_t): Change type of fourth and fifth diff --git a/libasm/Makefile.am b/libasm/Makefile.am index bd5779e8..62b5ee29 100644 --- a/libasm/Makefile.am +++ b/libasm/Makefile.am @@ -65,12 +65,17 @@ if !MUDFLAP libasm_pic_a_SOURCES = am_libasm_pic_a_OBJECTS = $(libasm_a_SOURCES:.c=.os) +libasm_so_LDLIBS = +if USE_TLS +libasm_so_LDLIBS += -lpthread +endif + libasm_so_SOURCES = libasm.so: 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) \ - ../libebl/libebl.a ../libelf/libelf.so + ../libebl/libebl.a ../libelf/libelf.so $(libasm_so_LDLIBS) if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) |