From 039d3c34f2e3578a8b7ada42f89213b844aa7a4e Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Mon, 6 Nov 2023 21:48:02 -0500 Subject: ldso: convert TLSDESC_BACKWARDS from "#ifdef" to "if" logic this style is preferred because it allows the code to be compile-checked even on archs where it is not used. --- ldso/dynlink.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'ldso') diff --git a/ldso/dynlink.c b/ldso/dynlink.c index bb02cd3c..6ba51b0a 100644 --- a/ldso/dynlink.c +++ b/ldso/dynlink.c @@ -542,13 +542,13 @@ static void do_relocs(struct dso *dso, size_t *rel, size_t rel_size, size_t stri + addend; #endif } -#ifdef TLSDESC_BACKWARDS /* Some archs (32-bit ARM at least) invert the order of * the descriptor members. Fix them up here. */ - size_t tmp = reloc_addr[0]; - reloc_addr[0] = reloc_addr[1]; - reloc_addr[1] = tmp; -#endif + if (TLSDESC_BACKWARDS) { + size_t tmp = reloc_addr[0]; + reloc_addr[0] = reloc_addr[1]; + reloc_addr[1] = tmp; + } break; default: error("Error relocating %s: unsupported relocation type %d", -- cgit 1.4.1