Message ID | 20181204005429.32681-3-joel@jms.id.au (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | powerpc: Add to linker script discards | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 24 lines checked |
On Tue, Dec 04, 2018 at 11:24:28AM +1030, Joel Stanley wrote: > Alan Modra <amodra@gmail.com> explains: > > > Likely you could discard .interp > and .dynstr too, and .dynsym when > > !CONFIG_PPC32. > > Discarding of interp and dynstr happened in a previous patch. The dynsym > cleanup was a bit less straightforward, so it gets it's own patch. > diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S > index 6570209b0671..2c93a420f456 100644 > --- a/arch/powerpc/kernel/vmlinux.lds.S > +++ b/arch/powerpc/kernel/vmlinux.lds.S > @@ -266,14 +266,13 @@ SECTIONS > } > #ifdef CONFIG_RELOCATABLE > . = ALIGN(8); > +#ifdef CONFIG_PPC32 > .dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) > { > -#ifdef CONFIG_PPC32 > __dynamic_symtab = .; > -#endif > *(.dynsym) > } > - .dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) } So this last line belongs in the previous patch then, right? Segher
On Wed, 5 Dec 2018 at 04:11, Segher Boessenkool <segher@kernel.crashing.org> wrote: > > On Tue, Dec 04, 2018 at 11:24:28AM +1030, Joel Stanley wrote: > > Alan Modra <amodra@gmail.com> explains: > > > > > Likely you could discard .interp > and .dynstr too, and .dynsym when > > > !CONFIG_PPC32. > > > > Discarding of interp and dynstr happened in a previous patch. The dynsym > > cleanup was a bit less straightforward, so it gets it's own patch. > > > diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S > > index 6570209b0671..2c93a420f456 100644 > > --- a/arch/powerpc/kernel/vmlinux.lds.S > > +++ b/arch/powerpc/kernel/vmlinux.lds.S > > @@ -266,14 +266,13 @@ SECTIONS > > } > > #ifdef CONFIG_RELOCATABLE > > . = ALIGN(8); > > +#ifdef CONFIG_PPC32 > > .dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) > > { > > -#ifdef CONFIG_PPC32 > > __dynamic_symtab = .; > > -#endif > > *(.dynsym) > > } > > - .dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) } > > So this last line belongs in the previous patch then, right? Correct. Good catch.
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 6570209b0671..2c93a420f456 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -266,14 +266,13 @@ SECTIONS } #ifdef CONFIG_RELOCATABLE . = ALIGN(8); +#ifdef CONFIG_PPC32 .dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { -#ifdef CONFIG_PPC32 __dynamic_symtab = .; -#endif *(.dynsym) } - .dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) } +#endif .dynamic : AT(ADDR(.dynamic) - LOAD_OFFSET) { __dynamic_start = .; @@ -389,5 +388,8 @@ SECTIONS *(.hash .gnu.hash) *(.interp) *(.dynstr) +#ifndef CONFIG_PPC32 + *(.dynsym) +#endif } }