From: Rich Felker <dalias@aerifal.cx>
Date: Tue, 21 Apr 2015 17:22:48 +0000 (-0400)
Subject: remove always-true conditional in dynamic linker TLSDESC processing
X-Git-Tag: v1.1.9~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c5ab5bd3be15eb9d49222df132a51ae8e8f78cbc;p=oweals%2Fmusl.git

remove always-true conditional in dynamic linker TLSDESC processing

the allocating path which can fail is for dynamic TLS, which can only
occur at runtime, and the check for runtime was already made in the
outer conditional.
---

diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index efb00496..7c92ef6c 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -340,7 +340,7 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri
 					error(
 					"Error relocating %s: cannot allocate TLSDESC for %s",
 					dso->name, sym ? name : "(local)" );
-					if (runtime) longjmp(*rtld_fail, 1);
+					longjmp(*rtld_fail, 1);
 				}
 				new->next = dso->td_index;
 				dso->td_index = new;