From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 16 Aug 2008 03:53:00 +0000 (+0000)
Subject: Fix build problem after merge of pmachata.threads branch when compiled without
X-Git-Tag: elfutils-0.136~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f729d77881262094d365d33ac51063e25a02e357;p=thirdparty%2Felfutils.git

Fix build problem after merge of pmachata.threads branch when compiled without
thread support.
---

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 193cb0333..0e4a92841 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* libelfP.h (LIBELF_CHECKED_LOCK): Use dummy definition also if
+	USE_TLS is not defined.
+
 2008-08-05  Petr Machata  <pmachata@redhat.com>
 
 	* elf_getdata.c, libelfP.h (__elf_getdata_internal):
diff --git a/libelf/libelfP.h b/libelf/libelfP.h
index 7dfd8dd3e..c90e89543 100644
--- a/libelf/libelfP.h
+++ b/libelf/libelfP.h
@@ -626,7 +626,7 @@ extern uint32_t __libelf_crc32 (uint32_t crc, unsigned char *buf, size_t len)
 /* Align offset to 4 bytes as needed for note name and descriptor data.  */
 #define NOTE_ALIGN(n)	(((n) + 3) & -4U)
 
-#ifdef NDEBUG
+#if defined NDEBUG || !defined USE_TLS
 # define LIBELF_CHECKED_LOCK(V, S) ((void)(V))
 #else
 /* Checked locking primitives.  Prints out an error to stderr if the