8 files changed, 22 insertions, 8 deletions
diff --git a/lib/libc/locale/_wcstod.h b/lib/libc/locale/_wcstod.h
index ae993ad675e..de9de77e086 100644
--- a/lib/libc/locale/_wcstod.h
+++ b/lib/libc/locale/_wcstod.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _wcstod.h,v 1.2 2013/06/02 15:22:20 matthew Exp $	*/
+/*	$OpenBSD: _wcstod.h,v 1.3 2015/09/12 16:23:14 guenther Exp $	*/
 /* $NetBSD: wcstod.c,v 1.4 2001/10/28 12:08:43 yamt Exp $ */
 
 /*-
@@ -151,3 +151,4 @@ fail:
 
 	return 0;
 }
+DEF_STRONG(FUNCNAME);
diff --git a/lib/libc/locale/_wcstol.h b/lib/libc/locale/_wcstol.h
index 7b49bbff27a..e105b0100ff 100644
--- a/lib/libc/locale/_wcstol.h
+++ b/lib/libc/locale/_wcstol.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _wcstol.h,v 1.1 2005/07/01 08:59:27 espie Exp $	*/
+/*	$OpenBSD: _wcstol.h,v 1.2 2015/09/12 16:23:14 guenther Exp $	*/
 /* $NetBSD: _wcstol.h,v 1.2 2003/08/07 16:43:03 agc Exp $ */
 
 /*-
@@ -134,3 +134,4 @@ FUNCNAME(const wchar_t *nptr, wchar_t **endptr, int base)
 		*endptr = (wchar_t *)(any ? s - 1 : nptr);
 	return (acc);
 }
+DEF_STRONG(FUNCNAME);
diff --git a/lib/libc/locale/_wcstoul.h b/lib/libc/locale/_wcstoul.h
index 736b38fbeab..c42442295d5 100644
--- a/lib/libc/locale/_wcstoul.h
+++ b/lib/libc/locale/_wcstoul.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: _wcstoul.h,v 1.1 2005/07/01 08:59:27 espie Exp $	*/
+/*	$OpenBSD: _wcstoul.h,v 1.2 2015/09/12 16:23:14 guenther Exp $	*/
 /* $NetBSD: _wcstoul.h,v 1.2 2003/08/07 16:43:03 agc Exp $ */
 
 /*
@@ -114,3 +114,4 @@ FUNCNAME(const wchar_t *nptr, wchar_t **endptr, int base)
 		*endptr = (wchar_t *)(any ? s - 1 : nptr);
 	return (acc);
 }
+DEF_STRONG(FUNCNAME);
diff --git a/lib/libc/locale/btowc.c b/lib/libc/locale/btowc.c
index 96273401ea2..455b3468f22 100644
--- a/lib/libc/locale/btowc.c
+++ b/lib/libc/locale/btowc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btowc.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
+/*	$OpenBSD: btowc.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */
 
 /*-
  * Copyright (c) 2002, 2003 Tim J. Robbins.
@@ -50,3 +50,4 @@ btowc(int c)
 		return (WEOF);
 	return (wc);
 }
+DEF_STRONG(btowc);
diff --git a/lib/libc/locale/iswctype.c b/lib/libc/locale/iswctype.c
index 0a557aaac76..fb0cde26392 100644
--- a/lib/libc/locale/iswctype.c
+++ b/lib/libc/locale/iswctype.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iswctype.c,v 1.4 2014/03/16 18:38:30 guenther Exp $ */
+/*	$OpenBSD: iswctype.c,v 1.5 2015/09/12 16:23:14 guenther Exp $ */
 /*	$NetBSD: iswctype.c,v 1.15 2005/02/09 21:35:46 kleink Exp $	*/
 
 /*
@@ -168,6 +168,7 @@ wcwidth(wchar_t c)
 		return (((unsigned)__runetype_w(c) & _CTYPE_SWM) >> _CTYPE_SWS);
 	return -1;
 }
+DEF_WEAK(wcwidth);
 
 wctrans_t
 wctrans(const char *charclass)
diff --git a/lib/libc/locale/mbrlen.c b/lib/libc/locale/mbrlen.c
index 0f05bd0721e..52df61a3c88 100644
--- a/lib/libc/locale/mbrlen.c
+++ b/lib/libc/locale/mbrlen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbrlen.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
+/*	$OpenBSD: mbrlen.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -37,3 +37,4 @@ mbrlen(const char * __restrict s, size_t n, mbstate_t * __restrict ps)
 		ps = &mbs;
 	return (mbrtowc(NULL, s, n, ps));
 }
+DEF_STRONG(mbrlen);
diff --git a/lib/libc/locale/multibyte_citrus.c b/lib/libc/locale/multibyte_citrus.c
index 739c4a8be5f..5e30f5bbee9 100644
--- a/lib/libc/locale/multibyte_citrus.c
+++ b/lib/libc/locale/multibyte_citrus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: multibyte_citrus.c,v 1.5 2015/02/05 12:59:57 millert Exp $ */
+/*	$OpenBSD: multibyte_citrus.c,v 1.6 2015/09/12 16:23:14 guenther Exp $ */
 /*	$NetBSD: multibyte_amd1.c,v 1.7 2009/01/11 02:46:28 christos Exp $ */
 
 /*-
@@ -51,6 +51,7 @@ mbsinit(const mbstate_t *ps)
 	cc = rl->rl_citrus_ctype;
 	return (*cc->cc_ops->co_mbsinit)(ps);
 }
+DEF_STRONG(mbsinit);
 
 size_t
 mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
@@ -63,6 +64,7 @@ mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 	cc = _CurrentRuneLocale->rl_citrus_ctype;
 	return (*cc->cc_ops->co_mbrtowc)(pwc, s, n, _ps_to_private(ps));
 }
+DEF_STRONG(mbrtowc);
 
 size_t
 mbsrtowcs(wchar_t *dst, const char **src, size_t len, mbstate_t *ps)
@@ -73,6 +75,7 @@ mbsrtowcs(wchar_t *dst, const char **src, size_t len, mbstate_t *ps)
 		ps = &mbs;
 	return (mbsnrtowcs(dst, src, SIZE_MAX, len, ps));
 }
+DEF_STRONG(mbsrtowcs);
 
 size_t
 mbsnrtowcs(wchar_t *dst, const char **src, size_t nmc, size_t len,
@@ -87,6 +90,7 @@ mbsnrtowcs(wchar_t *dst, const char **src, size_t nmc, size_t len,
 	return (*cc->cc_ops->co_mbsnrtowcs)(dst, src, nmc, len,
 	    _ps_to_private(ps));
 }
+DEF_WEAK(mbsnrtowcs);
 
 size_t
 wcrtomb(char *s, wchar_t wc, mbstate_t *ps)
@@ -99,6 +103,7 @@ wcrtomb(char *s, wchar_t wc, mbstate_t *ps)
 	cc = _CurrentRuneLocale->rl_citrus_ctype;
 	return (*cc->cc_ops->co_wcrtomb)(s, wc, _ps_to_private(ps));
 }
+DEF_STRONG(wcrtomb);
 
 size_t
 wcsrtombs(char *dst, const wchar_t **src, size_t len, mbstate_t *ps)
@@ -109,6 +114,7 @@ wcsrtombs(char *dst, const wchar_t **src, size_t len, mbstate_t *ps)
 		ps = &mbs;
 	return (wcsnrtombs(dst, src, SIZE_MAX, len, ps));
 }
+DEF_STRONG(wcsrtombs);
 
 size_t
 wcsnrtombs(char *dst, const wchar_t **src, size_t nwc, size_t len,
@@ -123,3 +129,4 @@ wcsnrtombs(char *dst, const wchar_t **src, size_t nwc, size_t len,
 	return (*cc->cc_ops->co_wcsnrtombs)(dst, src, nwc, len,
 	    _ps_to_private(ps));
 }
+DEF_WEAK(wcsnrtombs);
diff --git a/lib/libc/locale/wctob.c b/lib/libc/locale/wctob.c
index ea1f40c58aa..51ac3552368 100644
--- a/lib/libc/locale/wctob.c
+++ b/lib/libc/locale/wctob.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wctob.c,v 1.2 2012/12/05 23:20:00 deraadt Exp $ */
+/*	$OpenBSD: wctob.c,v 1.3 2015/09/12 16:23:14 guenther Exp $ */
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
  * All rights reserved.
@@ -41,3 +41,4 @@ wctob(wint_t c)
 		return (EOF);
 	return ((unsigned char)*buf);
 }
+DEF_STRONG(wctob);