remove always-true conditional in dynamic linker TLSDESC processing
authorRich Felker <dalias@aerifal.cx>
Tue, 21 Apr 2015 17:22:48 +0000 (13:22 -0400)
committerRich Felker <dalias@aerifal.cx>
Tue, 21 Apr 2015 17:22:48 +0000 (13:22 -0400)
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.

src/ldso/dynlink.c

index efb0049667365a4a7fe9ed3874d980cf84c27e7f..7c92ef6cd28f6e8d80383c356e1210c35a4b7595 100644 (file)
@@ -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;