Merge pull request #1007 from jpoimboe/ppc-replace-sections-syms

create-diff-object/ppc64le: Fix replace_sections_syms() for bundled s…
dynup · Jul 24, 2019 · 814fc06 · 814fc06
2 parents f96691f + cef3360
commit 814fc06
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
@@ -1282,6 +1282,15 @@ static void kpatch_replace_sections_syms(struct kpatch_elf *kelf)
 			if (rela->sym->sec && rela->sym->sec->sym) {
 				rela->sym = rela->sym->sec->sym;
 
+				/*
+				 * On ppc64le with GCC6+, the function symbol
+				 * starts 8 bytes past the beginning of the
+				 * section, because of localentry.  So even
+				 * though the symbol is bundled, we can't
+				 * assume it's at offset 0 in the section.
+				 */
+				rela->addend -= rela->sym->sym.st_value;
+
 				continue;
 			}
 

diff --git a/test/unit/objs b/test/unit/objs
+ −		ppc64le/ppc64le-bundled-localentry-issue-1007.ORIG.o
+ −		ppc64le/ppc64le-bundled-localentry-issue-1007.PATCHED.o
+6 −0		ppc64le/ppc64le-bundled-localentry-issue-1007.test