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

thread support.

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 193cb033391193606f382418ead10428e980e584..0e4a928416aaa976285bea83f7a4e2c63c21c69a 100644 (file)
--- 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 7dfd8dd3ec3cd9940d10e149f78812116a3266f4..c90e895433d9e3e3a806a7457610dd9d7f9b1144 100644 (file)
--- 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