diff options
| author | skrll <skrll@NetBSD.org> | 2022-06-13 16:03:07 +0000 |
|---|---|---|
| committer | skrll <skrll@NetBSD.org> | 2022-06-13 16:03:07 +0000 |
| commit | 2573399d0b77e187b6dc15ca21bd2ded19bbcbe7 (patch) | |
| tree | 01006b82c6e14807eff1ad2b663024642210ea22 /sys/lib | |
| parent | dc87a10122f49a51bcec4ec7a1dbf4ef6694c340 (diff) | |
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 (limited to 'sys/lib')
| -rw-r--r-- | sys/lib/libkern/arch/hppa/Makefile.inc | 3 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/hppa/milli_extra.S | 42 |
2 files changed, 44 insertions, 1 deletions
diff --git a/sys/lib/libkern/arch/hppa/Makefile.inc b/sys/lib/libkern/arch/hppa/Makefile.inc index 2b2db0b988c..3c88ff33338 100644 --- a/sys/lib/libkern/arch/hppa/Makefile.inc +++ b/sys/lib/libkern/arch/hppa/Makefile.inc @@ -1,7 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.12 2014/03/13 16:09:11 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.13 2022/06/13 16:03:07 skrll 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 --git a/sys/lib/libkern/arch/hppa/milli_extra.S b/sys/lib/libkern/arch/hppa/milli_extra.S new file mode 100644 index 00000000000..587e0f23304 --- /dev/null +++ b/sys/lib/libkern/arch/hppa/milli_extra.S @@ -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) |
