From 79d38fafe77ab295dfafc19c04e7ea96b20cfe7d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 5 Mar 2015 19:47:26 +0100 Subject: fix non-thread compile for xtensa --- ldso/ldso/xtensa/dl-tlsdesc.S | 4 ++++ ldso/ldso/xtensa/elfinterp.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/ldso/ldso/xtensa/dl-tlsdesc.S b/ldso/ldso/xtensa/dl-tlsdesc.S index a6ebc949e..dee42581c 100644 --- a/ldso/ldso/xtensa/dl-tlsdesc.S +++ b/ldso/ldso/xtensa/dl-tlsdesc.S @@ -18,6 +18,9 @@ #include #include + +#if defined(USE_TLS) && USE_TLS + #include "tlsdesc.h" @@ -94,3 +97,4 @@ _dl_tlsdesc_dynamic: .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic #endif /* SHARED */ +#endif /* USE_TLS */ diff --git a/ldso/ldso/xtensa/elfinterp.c b/ldso/ldso/xtensa/elfinterp.c index 1397e95c9..66deb63ab 100644 --- a/ldso/ldso/xtensa/elfinterp.c +++ b/ldso/ldso/xtensa/elfinterp.c @@ -31,8 +31,11 @@ */ #include "ldso.h" + +#if defined(USE_TLS) && USE_TLS #include "dl-tls.h" #include "tlsdeschtab.h" +#endif unsigned long _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) -- cgit v1.2.3