| Message ID | 1264936972-29634-1-git-send-email-lool@dooz.org |
|---|---|
| State | New |
| Headers | show |
On Sun, Jan 31, 2010 at 12:22:52PM +0100, Loïc Minier wrote: > Fix .rel.plt sections in the output to not only include .rel.plt > sections from the input but also the .rel.iplt sections and to define > the hidden symbols __rel_iplt_start and __rel_iplt_end around > .rel.iplt as otherwise we get undefined references to these when > linking statically to a multilib libc.a. This fixes the static build > under i386. > > Apply similar logic to rela.plt/.iplt and __rela_iplt/_plt_start/_end to > fix the static build under amd64. Thanks, applied. > Signed-off-by: Loïc Minier <lool@dooz.org> > --- > i386.ld | 16 ++++++++++++++-- > x86_64.ld | 16 ++++++++++++++-- > 2 files changed, 28 insertions(+), 4 deletions(-) > > diff --git a/i386.ld b/i386.ld > index f2dafec..f8df7bf 100644 > --- a/i386.ld > +++ b/i386.ld > @@ -39,8 +39,20 @@ SECTIONS > .rela.fini : { *(.rela.fini) } > .rel.bss : { *(.rel.bss) } > .rela.bss : { *(.rela.bss) } > - .rel.plt : { *(.rel.plt) } > - .rela.plt : { *(.rela.plt) } > + .rel.plt : > + { > + *(.rel.plt) > + PROVIDE_HIDDEN (__rel_iplt_start = .); > + *(.rel.iplt) > + PROVIDE_HIDDEN (__rel_iplt_end = .); > + } > + .rela.plt : > + { > + *(.rela.plt) > + PROVIDE_HIDDEN (__rela_iplt_start = .); > + *(.rela.iplt) > + PROVIDE_HIDDEN (__rela_iplt_end = .); > + } > .init : { *(.init) } =0x47ff041f > .text : > { > diff --git a/x86_64.ld b/x86_64.ld > index 24ea77d..46d8d4d 100644 > --- a/x86_64.ld > +++ b/x86_64.ld > @@ -35,8 +35,20 @@ SECTIONS > .rela.got : { *(.rela.got) } > .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } > .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } > - .rel.plt : { *(.rel.plt) } > - .rela.plt : { *(.rela.plt) } > + .rel.plt : > + { > + *(.rel.plt) > + PROVIDE_HIDDEN (__rel_iplt_start = .); > + *(.rel.iplt) > + PROVIDE_HIDDEN (__rel_iplt_end = .); > + } > + .rela.plt : > + { > + *(.rela.plt) > + PROVIDE_HIDDEN (__rela_iplt_start = .); > + *(.rela.iplt) > + PROVIDE_HIDDEN (__rela_iplt_end = .); > + } > .init : > { > KEEP (*(.init)) > -- > 1.6.5 > > > >
diff --git a/i386.ld b/i386.ld index f2dafec..f8df7bf 100644 --- a/i386.ld +++ b/i386.ld @@ -39,8 +39,20 @@ SECTIONS .rela.fini : { *(.rela.fini) } .rel.bss : { *(.rel.bss) } .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + .rel.plt : + { + *(.rel.plt) + PROVIDE_HIDDEN (__rel_iplt_start = .); + *(.rel.iplt) + PROVIDE_HIDDEN (__rel_iplt_end = .); + } + .rela.plt : + { + *(.rela.plt) + PROVIDE_HIDDEN (__rela_iplt_start = .); + *(.rela.iplt) + PROVIDE_HIDDEN (__rela_iplt_end = .); + } .init : { *(.init) } =0x47ff041f .text : { diff --git a/x86_64.ld b/x86_64.ld index 24ea77d..46d8d4d 100644 --- a/x86_64.ld +++ b/x86_64.ld @@ -35,8 +35,20 @@ SECTIONS .rela.got : { *(.rela.got) } .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } + .rel.plt : + { + *(.rel.plt) + PROVIDE_HIDDEN (__rel_iplt_start = .); + *(.rel.iplt) + PROVIDE_HIDDEN (__rel_iplt_end = .); + } + .rela.plt : + { + *(.rela.plt) + PROVIDE_HIDDEN (__rela_iplt_start = .); + *(.rela.iplt) + PROVIDE_HIDDEN (__rela_iplt_end = .); + } .init : { KEEP (*(.init))
Fix .rel.plt sections in the output to not only include .rel.plt sections from the input but also the .rel.iplt sections and to define the hidden symbols __rel_iplt_start and __rel_iplt_end around .rel.iplt as otherwise we get undefined references to these when linking statically to a multilib libc.a. This fixes the static build under i386. Apply similar logic to rela.plt/.iplt and __rela_iplt/_plt_start/_end to fix the static build under amd64. Signed-off-by: Loïc Minier <lool@dooz.org> --- i386.ld | 16 ++++++++++++++-- x86_64.ld | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-)