From: Roland McGrath <roland@redhat.com>
Date: Thu, 4 Dec 2008 06:28:06 +0000 (+0000)
Subject: merge of '4c5dbb5e116d9a9c7f9014a3dcbabba8e7d89327'
X-Git-Tag: elfutils-0.138~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12af5a2882bf23f3f2b55d78ef2ea568bac120de;p=thirdparty%2Felfutils.git

merge of '4c5dbb5e116d9a9c7f9014a3dcbabba8e7d89327'
     and 'fddaff07d3c095a3d26f41fe7a7da147c024bd96'
---

diff --git a/libasm/ChangeLog b/libasm/ChangeLog
index 2894970e3..c98deb649 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 bd5779e8e..62b5ee29c 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)