merge of '4c5dbb5e116d9a9c7f9014a3dcbabba8e7d89327'

     and 'fddaff07d3c095a3d26f41fe7a7da147c024bd96'

diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index 2894970e3006811015af887650b238e2ba184c34..c98deb649b8b226b4aa34df9c02fc56b4624a243 100644 (file)
--- 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 bd5779e8e2f246cdd556141eb43352f953042f6b..62b5ee29ce4ed1c52a001b737ebdfadfa9dbdfe3 100644 (file)
--- 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)