Message ID | 20200427211628.4244-1-hjl.tools@gmail.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | powerpc: Discard .rela* sections if CONFIG_RELOCATABLE is undefined | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (54dc28ff5e0b3585224d49a31b53e030342ca5c3) |
snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
snowpatch_ozlabs/build-pmac32 | warning | Upstream build failed, couldn't test patch |
snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 13 lines checked |
snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
"H.J. Lu" <hjl.tools@gmail.com> writes: > arch/powerpc/kernel/vmlinux.lds.S has > > DISCARDS > /DISCARD/ : { > *(*.EMB.apuinfo) > *(.glink .iplt .plt .rela* .comment) > *(.gnu.version*) > *(.gnu.attributes) > *(.eh_frame) > } > > Since .rela* sections are needed when CONFIG_RELOCATABLE is defined, > change to discard .rela* sections if CONFIG_RELOCATABLE is undefined. > > Signed-off-by: H.J. Lu <hjl.tools@gmail.com> > Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) > --- > arch/powerpc/kernel/vmlinux.lds.S | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Please insert this patch into your series prior to the patch that caused the build break. cheers > diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S > index 31a0f201fb6f..4ba07734a210 100644 > --- a/arch/powerpc/kernel/vmlinux.lds.S > +++ b/arch/powerpc/kernel/vmlinux.lds.S > @@ -366,9 +366,12 @@ SECTIONS > DISCARDS > /DISCARD/ : { > *(*.EMB.apuinfo) > - *(.glink .iplt .plt .rela* .comment) > + *(.glink .iplt .plt .comment) > *(.gnu.version*) > *(.gnu.attributes) > *(.eh_frame) > +#ifndef CONFIG_RELOCATABLE > + *(.rela*) > +#endif > } > } > -- > 2.25.4
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 31a0f201fb6f..4ba07734a210 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -366,9 +366,12 @@ SECTIONS DISCARDS /DISCARD/ : { *(*.EMB.apuinfo) - *(.glink .iplt .plt .rela* .comment) + *(.glink .iplt .plt .comment) *(.gnu.version*) *(.gnu.attributes) *(.eh_frame) +#ifndef CONFIG_RELOCATABLE + *(.rela*) +#endif } }