[src/netbsd-9]: src/sys/lib/libkern/arch/hppa Pull up following revision(s) (...

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

details:   https://anonhg.NetBSD.org/src/rev/475973ee48d9
branches:  netbsd-9
changeset: 366783:475973ee48d9
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jun 14 10:41:18 2022 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #1472):

        sys/lib/libkern/arch/hppa/Makefile.inc: revision 1.13
        sys/lib/libkern/arch/hppa/milli.S: revision 1.3
        sys/lib/libkern/arch/hppa/milli_extra.S: revision 1.1

Don't need $$sh_func_adrs

Provide a __canonicalize_funcptr_for_compare which only needs to return
the passed value as the kernel doesn't do PLABELS.
PR/56878 (hppa: kernel module lua fails to load)

diffstat:

 sys/lib/libkern/arch/hppa/Makefile.inc  |   3 +-
 sys/lib/libkern/arch/hppa/milli.S       |   4 +-
 sys/lib/libkern/arch/hppa/milli_extra.S |  42 +++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)

diffs (84 lines):

diff -r b960fb3e2166 -r 475973ee48d9 sys/lib/libkern/arch/hppa/Makefile.inc
--- a/sys/lib/libkern/arch/hppa/Makefile.inc    Tue Jun 14 10:37:05 2022 +0000
+++ b/sys/lib/libkern/arch/hppa/Makefile.inc    Tue Jun 14 10:41:18 2022 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile.inc,v 1.12 2014/03/13 16:09:11 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.12.34.1 2022/06/14 10:41:18 martin Exp $
 
 SRCS+= milli.S
 SRCS+= bcopy.S memcpy.S memmove.S
+SRCS+= milli_extra.S
 
 # XXX: spcopy does not really belong in libkern in the first place
 .ifndef RUMPKERNEL
diff -r b960fb3e2166 -r 475973ee48d9 sys/lib/libkern/arch/hppa/milli.S
--- a/sys/lib/libkern/arch/hppa/milli.S Tue Jun 14 10:37:05 2022 +0000
+++ b/sys/lib/libkern/arch/hppa/milli.S Tue Jun 14 10:41:18 2022 +0000
@@ -1,4 +1,4 @@
-;      $NetBSD: milli.S,v 1.1 2002/06/06 20:03:39 fredette Exp $
+;      $NetBSD: milli.S,v 1.1.204.1 2022/06/14 10:41:18 martin Exp $
 ;
 ;      $OpenBSD: milli.S,v 1.5 2001/03/29 04:08:20 mickey Exp $
 ;
@@ -443,7 +443,6 @@
        be      0(sr0,r22)
        stw     rp,-24(sp)
        .procend
-#endif
 
 $$sh_func_adrs:
        .proc
@@ -456,6 +455,7 @@
        bv      r0(r31)
        ldws    0(r26),ret1
        .procend
+#endif
 
 temp: .EQU     r1
 
diff -r b960fb3e2166 -r 475973ee48d9 sys/lib/libkern/arch/hppa/milli_extra.S
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/lib/libkern/arch/hppa/milli_extra.S   Tue Jun 14 10:41:18 2022 +0000
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2022 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "machine/asm.h"
+
+
+#define        MILLI_ENTRY(x)                                  !\
+       .text ! .align 4                                !\
+       .export x, millicode ! .label x ! .proc         !\
+       .callinfo no_calls                              !\
+       .entry
+
+MILLI_ENTRY(__canonicalize_funcptr_for_compare)
+       bv      %r0(%sp)
+        copy   %arg0, %ret0
+EXIT(__canonicalize_funcptr_for_compare)