John Bowler writes in Bug 385:

in various places defined(__arm__) is used to protect/select code which
is ARM specific, that code must also be selected for __thumb__ because
__thumb__ is an ARM but __arm__ is not set...

diff --git a/ldso/include/dl-string.h b/ldso/include/dl-string.h
index e2d4d36..ec098d2 100644 (file)
--- a/ldso/include/dl-string.h
+++ b/ldso/include/dl-string.h
@@ -276,8 +276,8 @@ static __always_inline char * _dl_simple_ltoahex(char * local, unsigned long i)
 
 /* On some arches constant strings are referenced through the GOT.
  * This requires that load_addr must already be defined... */
-#if defined(mc68000) || defined(__arm__) || defined(__mips__) \
-                     || defined(__sh__)  || defined(__powerpc__)
+#if defined(mc68000)  || defined(__arm__) || defined(__thumb__) || \
+    defined(__mips__) || defined(__sh__)  || defined(__powerpc__)
 # define CONSTANT_STRING_GOT_FIXUP(X) \
        if ((X) < (const char *) load_addr) (X) += load_addr
 # define NO_EARLY_SEND_STDERR