Message ID | alpine.DEB.2.20.17.1611171225000.10580@tp.orcam.me.uk |
---|---|
State | Accepted |
Headers | show |
On Thu, 17 Nov 2016, Maciej W. Rozycki wrote: > 2016-11-17 Matthew Fortune <Matthew.Fortune@imgtec.com> > Maciej W. Rozycki <macro@imgtec.com> > > * sysdeps/mips/mips32/crti.S (_init): Add `.insn' pseudo-op at > `.Lno_weak_fn' label. > * sysdeps/mips/mips64/n32/crti.S (_init): Likewise. > * sysdeps/mips/mips64/n64/crti.S (_init): Likewise. OK. We may want to backport this to release branches.
On Thu, 17 Nov 2016, Joseph Myers wrote: > > * sysdeps/mips/mips32/crti.S (_init): Add `.insn' pseudo-op at > > `.Lno_weak_fn' label. > > * sysdeps/mips/mips64/n32/crti.S (_init): Likewise. > > * sysdeps/mips/mips64/n64/crti.S (_init): Likewise. > > OK. We may want to backport this to release branches. Indeed and I can do it while I am at it. How far back do you think it would make sense to go with it? Patch committed now, thanks for your review. Maciej
On Fri, 18 Nov 2016, Maciej W. Rozycki wrote: > On Thu, 17 Nov 2016, Joseph Myers wrote: > > > > * sysdeps/mips/mips32/crti.S (_init): Add `.insn' pseudo-op at > > > `.Lno_weak_fn' label. > > > * sysdeps/mips/mips64/n32/crti.S (_init): Likewise. > > > * sysdeps/mips/mips64/n64/crti.S (_init): Likewise. > > > > OK. We may want to backport this to release branches. > > Indeed and I can do it while I am at it. How far back do you think it > would make sense to go with it? The last couple (2.24 and 2.23) seem to be in reasonably active use (i.e. getting patches backported to them). I don't know how likely people are to use any older branches with current binutils.
On Fri, 18 Nov 2016, Joseph Myers wrote: > > Indeed and I can do it while I am at it. How far back do you think it > > would make sense to go with it? > > The last couple (2.24 and 2.23) seem to be in reasonably active use (i.e. > getting patches backported to them). I don't know how likely people are > to use any older branches with current binutils. Me neither and myself I tend to stick to the master branch. Patch backported now, to both versions. Maciej
Index: glibc/sysdeps/mips/mips32/crti.S =================================================================== --- glibc.orig/sysdeps/mips/mips32/crti.S 2016-11-17 12:38:44.330014101 +0000 +++ glibc/sysdeps/mips/mips32/crti.S 2016-11-17 15:28:32.203511190 +0000 @@ -74,6 +74,7 @@ .reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION 1: jalr $25 .Lno_weak_fn: + .insn #else lw $25,%got(PREINIT_FUNCTION)($28) .reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION Index: glibc/sysdeps/mips/mips64/n32/crti.S =================================================================== --- glibc.orig/sysdeps/mips/mips64/n32/crti.S 2016-11-17 15:30:23.000000000 +0000 +++ glibc/sysdeps/mips/mips64/n32/crti.S 2016-11-17 15:30:48.510029889 +0000 @@ -74,6 +74,7 @@ .reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION 1: jalr $25 .Lno_weak_fn: + .insn #else lw $25,%got_disp(PREINIT_FUNCTION)($28) .reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION Index: glibc/sysdeps/mips/mips64/n64/crti.S =================================================================== --- glibc.orig/sysdeps/mips/mips64/n64/crti.S 2016-11-17 15:30:30.000000000 +0000 +++ glibc/sysdeps/mips/mips64/n64/crti.S 2016-11-17 15:30:56.644097664 +0000 @@ -74,6 +74,7 @@ .reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION 1: jalr $25 .Lno_weak_fn: + .insn #else ld $25,%got_disp(PREINIT_FUNCTION)($28) .reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION