35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From: Andreas Schwab <schwab@linux-m68k.org>
|
|
Date: Fri, 5 Feb 2016 19:50:03 +0100
|
|
Subject: powerpc: Fix dedotify for binutils >= 2.26
|
|
Origin: https://git.kernel.org/linus/f15838e9cac8f78f0cc506529bb9d3b9fa589c1f
|
|
|
|
Since binutils 2.26 BFD is doing suffix merging on STRTAB sections. But
|
|
dedotify modifies the symbol names in place, which can also modify
|
|
unrelated symbols with a name that matches a suffix of a dotted name. To
|
|
remove the leading dot of a symbol name we can just increment the pointer
|
|
into the STRTAB section instead.
|
|
|
|
Backport to all stables to avoid breakage when people update their
|
|
binutils - mpe.
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
|
|
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
|
|
---
|
|
arch/powerpc/kernel/module_64.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
|
|
index ac64ffdb52c8..08b7a40de5f8 100644
|
|
--- a/arch/powerpc/kernel/module_64.c
|
|
+++ b/arch/powerpc/kernel/module_64.c
|
|
@@ -340,7 +340,7 @@ static void dedotify(Elf64_Sym *syms, unsigned int numsyms, char *strtab)
|
|
if (name[0] == '.') {
|
|
if (strcmp(name+1, "TOC.") == 0)
|
|
syms[i].st_shndx = SHN_ABS;
|
|
- memmove(name, name+1, strlen(name));
|
|
+ syms[i].st_name++;
|
|
}
|
|
}
|
|
}
|