diff options
author | Ulrich Drepper <drepper@redhat.com> | 2008-08-16 03:53:00 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2008-08-16 03:53:00 +0000 |
commit | f729d77881262094d365d33ac51063e25a02e357 (patch) | |
tree | 2a1f1b205022ff9ae0772d248b1ea34b6fe4fb82 | |
parent | d56e232fb8f8cd97a336ed612c89145ec121f785 (diff) | |
download | elfutils-f729d77881262094d365d33ac51063e25a02e357.tar.gz |
Fix build problem after merge of pmachata.threads branch when compiled without
thread support.
-rw-r--r-- | libelf/ChangeLog | 5 | ||||
-rw-r--r-- | libelf/libelfP.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libelf/ChangeLog b/libelf/ChangeLog index 193cb033..0e4a9284 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 7dfd8dd3..c90e8954 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 |