diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-03-27 20:45:10 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2010-03-27 20:45:10 +0000 |
| commit | f926ad1701bd0ef40ffbcbcbeb51863113b1a3f0 (patch) | |
| tree | 2c5522710c7259b7feb0785b60a44c64d7d8b68f /libexec/ld.so | |
| parent | df315f56bf9147d202f3c714cb0fb50d85295e3c (diff) | |
Remove explicit nop's in delay slots introduced in the previous commit. They
are already inserted as part of jal/jr expansion by gas, and we don't need
another one.
suggested by miod@
Diffstat (limited to 'libexec/ld.so')
| -rw-r--r-- | libexec/ld.so/mips64/ldasm.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libexec/ld.so/mips64/ldasm.S b/libexec/ld.so/mips64/ldasm.S index fa96800fa1b..366fa09627b 100644 --- a/libexec/ld.so/mips64/ldasm.S +++ b/libexec/ld.so/mips64/ldasm.S @@ -1,4 +1,4 @@ -/* $OpenBSD: ldasm.S,v 1.5 2010/03/27 20:16:15 kettenis Exp $ */ +/* $OpenBSD: ldasm.S,v 1.6 2010/03/27 20:45:09 kettenis Exp $ */ /* * Copyright (c) 1998-2002 Opsycon AB, Sweden. @@ -135,7 +135,7 @@ _dl_bind_start: move a0, v1 move a1, t8 jal _dl_bind - nop + move sp, s0 REG_L ra, RAOFF(sp) REG_L s0, S0OFF(sp) @@ -151,5 +151,4 @@ _dl_bind_start: PTR_ADDU sp, FRAMESZ move t9, v0 jr t9 - nop .end _dl_bind_start |