diff options
author | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2009-12-16 13:12:00 +0100 |
---|---|---|
committer | Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | 2009-12-17 13:45:51 +0100 |
commit | f3217f9be3225c4943677d03b274cbc0cb4ed228 (patch) | |
tree | cd994714586789ad2d039b62e5411406176e0396 /ldso/include/dl-hash.h | |
parent | 02a89fe640faeb77920643190bff29894e503d64 (diff) |
check if USE_TLS is defined before use
This patch will convert all the #ifdef USE_TLS and #if USE_TLS to
#if defined(USE_TLS) && USE_TLS.
By checking if the USE_TLS is defined before checking its value will result in
correct behavior for architectures not defining this config symbol.
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Acked-by: Carmelo AMOROSO <carmelo.amoroso@st.com>
Diffstat (limited to 'ldso/include/dl-hash.h')
-rw-r--r-- | ldso/include/dl-hash.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index 22042145e..34333f40f 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -35,7 +35,7 @@ struct elf_resolve { struct elf_resolve * prev; /* Nothing after this address is used by gdb. */ -#if USE_TLS +#if defined(USE_TLS) && USE_TLS /* Thread-local storage related info. */ /* Start of the initialization image. */ @@ -138,7 +138,7 @@ extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname, unsigned long dynamic_addr, unsigned long dynamic_size); /* Only need extra arg with some configurations */ -#if !(USE_TLS || defined __FDPIC__) +#if !((defined(USE_TLS) && USE_TLS) || defined __FDPIC__) # define _dl_lookup_hash(n, r, m, c, t) _dl_lookup_hash(n, r, m, c) #endif extern char *_dl_lookup_hash(const char *name, struct dyn_elf *rpnt, |