[src/netbsd-6-0]: src/sys/arch/sparc64/sparc64 Pull up following revision(s) ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/326da4717955
branches:  netbsd-6-0
changeset: 775155:326da4717955
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Sep 24 13:06:47 2016 +0000

description:
Pull up following revision(s) (requested by martin in ticket #1405):
        sys/arch/sparc64/sparc64/kobj_machdep.c: revision 1.5
        sys/arch/sparc64/sparc64/kobj_machdep.c: revision 1.6
Follow rev. 1.54, 1.55 of libexec/ld.elf_so/arch/sparc64/mdreloc.c.
The target of the OLO10 relocation is the simd13 field of the instruction,
so use a 13 bit target mask.
Fixes PR kern/51436 (I broke this myself in rev 1.4)

diffstat:

 sys/arch/sparc64/sparc64/kobj_machdep.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r e0d3ccc909ec -r 326da4717955 sys/arch/sparc64/sparc64/kobj_machdep.c
--- a/sys/arch/sparc64/sparc64/kobj_machdep.c   Sat Sep 24 13:01:38 2016 +0000
+++ b/sys/arch/sparc64/sparc64/kobj_machdep.c   Sat Sep 24 13:06:47 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kobj_machdep.c,v 1.4 2010/05/02 11:43:30 martin Exp $  */
+/*     $NetBSD: kobj_machdep.c,v 1.4.20.1 2016/09/24 13:06:47 bouyer Exp $     */
 
 /*-
  * Copyright (c) 2001 Jake Burkholder.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.4 2010/05/02 11:43:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.4.20.1 2016/09/24 13:06:47 bouyer Exp $");
 
 #define        ELFSIZE         ARCH_ELFSIZE
 
@@ -164,15 +164,15 @@
        _BM(22), _BM(10),               /* _HIPLT22, LOPLT10 */
        _BM(32), _BM(22), _BM(10),      /* _PCPLT32, _PCPLT22, _PCPLT10 */
        _BM(10), _BM(11), -1,           /* _10, _11, _64 */
-       _BM(10), _BM(22),               /* _OLO10, _HH22 */
+       _BM(13), _BM(22),               /* _OLO10, _HH22 */
        _BM(10), _BM(22),               /* _HM10, _LM22 */
        _BM(22), _BM(10), _BM(22),      /* _PC_HH22, _PC_HM10, _PC_LM22 */
        _BM(16), _BM(19),               /* _WDISP16, _WDISP19 */
        -1,                             /* GLOB_JMP */
-       _BM(7), _BM(5), _BM(6)          /* _7, _5, _6 */
+       _BM(7), _BM(5), _BM(6),         /* _7, _5, _6 */
        -1, -1,                         /* DISP64, PLT64 */
        _BM(22), _BM(13),               /* HIX22, LOX10 */
-       _BM(22), _BM(10), _BM(13),      /* H44, M44, L44 */
+       _BM(22), _BM(10), _BM(12),      /* H44, M44, L44 */
        -1, -1, _BM(16),                /* REGISTER, UA64, UA16 */
 #undef _BM
 };