diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/mips/mips32/crti.S | 1 | ||||
| -rw-r--r-- | sysdeps/mips/mips64/n32/crti.S | 1 | ||||
| -rw-r--r-- | sysdeps/mips/mips64/n64/crti.S | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 37cb2f8819..24ce4491dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2016-11-23 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. + 2016-11-15 Denis Kaganovich <mahatma@eu.by> Magnus Granberg <zorry@gentoo.org> Mike Frysinger <vapier@gentoo.org> diff --git a/sysdeps/mips/mips32/crti.S b/sysdeps/mips/mips32/crti.S index 5c0ad7328a..dfbbdc4f8f 100644 --- a/sysdeps/mips/mips32/crti.S +++ b/sysdeps/mips/mips32/crti.S @@ -74,6 +74,7 @@ _init: .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 diff --git a/sysdeps/mips/mips64/n32/crti.S b/sysdeps/mips/mips64/n32/crti.S index 00b89f3894..afe6d8edaa 100644 --- a/sysdeps/mips/mips64/n32/crti.S +++ b/sysdeps/mips/mips64/n32/crti.S @@ -74,6 +74,7 @@ _init: .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 diff --git a/sysdeps/mips/mips64/n64/crti.S b/sysdeps/mips/mips64/n64/crti.S index f59b20c631..4049d29290 100644 --- a/sysdeps/mips/mips64/n64/crti.S +++ b/sysdeps/mips/mips64/n64/crti.S @@ -74,6 +74,7 @@ _init: .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 |