diff --git a/sys/lib/libkern/arch/sh3/ashiftrt.S b/sys/lib/libkern/arch/sh3/ashiftrt.S
index cb02f959b739..ed5b09e0c4ba 100644
--- a/sys/lib/libkern/arch/sh3/ashiftrt.S
+++ b/sys/lib/libkern/arch/sh3/ashiftrt.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: ashiftrt.S,v 1.6 2006/05/22 20:56:44 uwe Exp $	*/
+/*	$NetBSD: ashiftrt.S,v 1.7 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -29,6 +29,42 @@
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __ashiftrt_r4_0
+	.hidden __ashiftrt_r4_1
+	.hidden __ashiftrt_r4_2
+	.hidden __ashiftrt_r4_3
+	.hidden __ashiftrt_r4_4
+	.hidden __ashiftrt_r4_5
+	.hidden __ashiftrt_r4_6
+	.hidden __ashiftrt_r4_7
+	.hidden __ashiftrt_r4_8
+	.hidden __ashiftrt_r4_9
+	.hidden __ashiftrt_r4_10
+	.hidden __ashiftrt_r4_11
+	.hidden __ashiftrt_r4_12
+	.hidden __ashiftrt_r4_13
+	.hidden __ashiftrt_r4_14
+	.hidden __ashiftrt_r4_15
+	.hidden __ashiftrt_r4_16
+	.hidden __ashiftrt_r4_17
+	.hidden __ashiftrt_r4_18
+	.hidden __ashiftrt_r4_19
+	.hidden __ashiftrt_r4_20
+	.hidden __ashiftrt_r4_21
+	.hidden __ashiftrt_r4_22
+	.hidden __ashiftrt_r4_23
+	.hidden __ashiftrt_r4_24
+	.hidden __ashiftrt_r4_25
+	.hidden __ashiftrt_r4_26
+	.hidden __ashiftrt_r4_27
+	.hidden __ashiftrt_r4_28
+	.hidden __ashiftrt_r4_29
+	.hidden __ashiftrt_r4_30
+	.hidden __ashiftrt_r4_31
+#endif  /* __ELF__ */
+
+
 NENTRY(__ashiftrt_r4_31)
 	shll	r4
 	rts
diff --git a/sys/lib/libkern/arch/sh3/ashlsi3.S b/sys/lib/libkern/arch/sh3/ashlsi3.S
index 057c1c442000..ea36b8863e43 100644
--- a/sys/lib/libkern/arch/sh3/ashlsi3.S
+++ b/sys/lib/libkern/arch/sh3/ashlsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: ashlsi3.S,v 1.5 2006/05/22 20:56:44 uwe Exp $	*/
+/*	$NetBSD: ashlsi3.S,v 1.6 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -29,6 +29,11 @@
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __ashlsi3
+#endif
+
+
 NENTRY(__ashlsi3)
 	shld	r5, r4
 	rts
diff --git a/sys/lib/libkern/arch/sh3/ashrsi3.S b/sys/lib/libkern/arch/sh3/ashrsi3.S
index 43b3eaa46814..3da686a6f0a3 100644
--- a/sys/lib/libkern/arch/sh3/ashrsi3.S
+++ b/sys/lib/libkern/arch/sh3/ashrsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: ashrsi3.S,v 1.5 2006/05/22 20:56:44 uwe Exp $	*/
+/*	$NetBSD: ashrsi3.S,v 1.6 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -29,6 +29,11 @@
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __ashrsi3
+#endif
+
+
 NENTRY(__ashrsi3)
 	tst	r5, r5
 	bt	noshift
diff --git a/sys/lib/libkern/arch/sh3/lshrsi3.S b/sys/lib/libkern/arch/sh3/lshrsi3.S
index cf1e48b05be8..42c0cab3c963 100644
--- a/sys/lib/libkern/arch/sh3/lshrsi3.S
+++ b/sys/lib/libkern/arch/sh3/lshrsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: lshrsi3.S,v 1.5 2006/05/22 20:56:44 uwe Exp $	*/
+/*	$NetBSD: lshrsi3.S,v 1.6 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -29,6 +29,11 @@
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __lshrsi3
+#endif
+
+
 NENTRY(__lshrsi3)
 	tst	r5, r5
 	bt	noshift
diff --git a/sys/lib/libkern/arch/sh3/movstr.S b/sys/lib/libkern/arch/sh3/movstr.S
index 4707d9a9f549..7786b23796d4 100644
--- a/sys/lib/libkern/arch/sh3/movstr.S
+++ b/sys/lib/libkern/arch/sh3/movstr.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: movstr.S,v 1.8 2006/05/22 21:34:08 uwe Exp $	*/
+/*	$NetBSD: movstr.S,v 1.9 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -28,6 +28,12 @@
 
 #include <machine/asm.h>
 
+
+#ifdef __ELF__
+	.hidden __movstr, __movmem
+#endif
+
+
 NENTRY(__movstr)
 	mov	#16, r0
 	cmp/gt	r0, r6
diff --git a/sys/lib/libkern/arch/sh3/movstrSI.S b/sys/lib/libkern/arch/sh3/movstrSI.S
index bd299f7c59b7..75b410469624 100644
--- a/sys/lib/libkern/arch/sh3/movstrSI.S
+++ b/sys/lib/libkern/arch/sh3/movstrSI.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: movstrSI.S,v 1.7 2006/05/22 21:34:08 uwe Exp $	*/
+/*	$NetBSD: movstrSI.S,v 1.8 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*
  * Copyright (c) 2000 SHIMIZU Ryo.  All rights reserved.
@@ -29,6 +29,26 @@
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __movstrSI4, __movmemSI4 
+	.hidden __movstrSI8, __movmemSI8 
+	.hidden __movstrSI12, __movmemSI12
+	.hidden __movstrSI16, __movmemSI16
+	.hidden __movstrSI20, __movmemSI20
+	.hidden __movstrSI24, __movmemSI24
+	.hidden __movstrSI28, __movmemSI28
+	.hidden __movstrSI32, __movmemSI32
+	.hidden __movstrSI36, __movmemSI36
+	.hidden __movstrSI40, __movmemSI40
+	.hidden __movstrSI44, __movmemSI44
+	.hidden __movstrSI48, __movmemSI48
+	.hidden __movstrSI52, __movmemSI52
+	.hidden __movstrSI56, __movmemSI56
+	.hidden __movstrSI60, __movmemSI60
+	.hidden __movstrSI64, __movmemSI64
+#endif
+
+
 NENTRY(__movstrSI64)
 	mov.l	@(60, r5), r0
 	mov.l	r0, @(60, r4)
diff --git a/sys/lib/libkern/arch/sh3/movstrSI12_i4.S b/sys/lib/libkern/arch/sh3/movstrSI12_i4.S
index 6156206b2c0b..2ef09c4504f6 100644
--- a/sys/lib/libkern/arch/sh3/movstrSI12_i4.S
+++ b/sys/lib/libkern/arch/sh3/movstrSI12_i4.S
@@ -1,8 +1,13 @@
-/*	$NetBSD: movstrSI12_i4.S,v 1.1 2007/03/14 22:22:53 uwe Exp $	*/
+/*	$NetBSD: movstrSI12_i4.S,v 1.2 2009/01/07 22:15:18 uwe Exp $	*/
 
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __movstrSI12_i4, __movmemSI12_i4
+#endif
+
+
 NENTRY(__movstrSI12_i4)
 	mov.l	@r5, r0
 	mov.l	@(4, r5), r1
diff --git a/sys/lib/libkern/arch/sh3/movstr_i4.S b/sys/lib/libkern/arch/sh3/movstr_i4.S
index 8532bc7ff957..24c47e357dd6 100644
--- a/sys/lib/libkern/arch/sh3/movstr_i4.S
+++ b/sys/lib/libkern/arch/sh3/movstr_i4.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: movstr_i4.S,v 1.5 2006/05/22 21:34:08 uwe Exp $	*/
+/*	$NetBSD: movstr_i4.S,v 1.6 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (C) 2002 SHIMIZU Ryo.  All rights reserved.
@@ -29,6 +29,12 @@
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __movstr_i4_odd, __movmem_i4_odd
+	.hidden __movstr_i4_even, __movmem_i4_even
+#endif
+
+
 NENTRY(__movstr_i4_odd)
 	add	#-8,r4
 	nop
diff --git a/sys/lib/libkern/arch/sh3/mulsi3.S b/sys/lib/libkern/arch/sh3/mulsi3.S
index 8fb3ec32ac8c..9f6e9c05e785 100644
--- a/sys/lib/libkern/arch/sh3/mulsi3.S
+++ b/sys/lib/libkern/arch/sh3/mulsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: mulsi3.S,v 1.5 2006/05/22 20:56:44 uwe Exp $	*/
+/*	$NetBSD: mulsi3.S,v 1.6 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -29,6 +29,11 @@
 #include <machine/asm.h>
 
 
+#ifdef __ELF__
+	.hidden __mulsi3
+#endif
+
+
 NENTRY(__mulsi3)
 	mul.l	r4, r5
 	rts
diff --git a/sys/lib/libkern/arch/sh3/sdivsi3.S b/sys/lib/libkern/arch/sh3/sdivsi3.S
index d1d71471e42b..4357ee453b4f 100644
--- a/sys/lib/libkern/arch/sh3/sdivsi3.S
+++ b/sys/lib/libkern/arch/sh3/sdivsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdivsi3.S,v 1.8 2006/05/22 20:56:44 uwe Exp $	*/
+/*	$NetBSD: sdivsi3.S,v 1.9 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,7 +36,12 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: sdivsi3.S,v 1.8 2006/05/22 20:56:44 uwe Exp $")
+	RCSID("$NetBSD: sdivsi3.S,v 1.9 2009/01/07 22:15:18 uwe Exp $")
+#endif
+
+
+#ifdef __ELF__
+	.hidden __sdivsi3
 #endif
 
 
diff --git a/sys/lib/libkern/arch/sh3/udivsi3.S b/sys/lib/libkern/arch/sh3/udivsi3.S
index b04acc0c007e..ca233d9793bc 100644
--- a/sys/lib/libkern/arch/sh3/udivsi3.S
+++ b/sys/lib/libkern/arch/sh3/udivsi3.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: udivsi3.S,v 1.7 2006/05/22 20:56:44 uwe Exp $	*/
+/*	$NetBSD: udivsi3.S,v 1.8 2009/01/07 22:15:18 uwe Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -36,7 +36,7 @@
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-	RCSID("$NetBSD: udivsi3.S,v 1.7 2006/05/22 20:56:44 uwe Exp $")
+	RCSID("$NetBSD: udivsi3.S,v 1.8 2009/01/07 22:15:18 uwe Exp $")
 #endif
 
 /*
@@ -59,6 +59,11 @@
  */
 
 
+#ifdef __ELF__
+	.hidden __udivsi3
+#endif
+
+
 /* r0 <= r4 / r5 */
 NENTRY(__udivsi3)
 	tst	r5, r5