Switch libc and libm to use strong aliases rather than weak aliases

where appropriate.  Among other things makes the symbols consistent
across all architectures (notably where ldbl mantissa is 53 bits).

While at it, kill unused LINTLIBRARY/PROTOLIB1 cruft which was there
to trick lint into recording the right prototypes for aliased
functions.  Most of the work done at the awesome n2k13 hackathon.

Agreed by kettenis@, guenther@, matthew@.

28 files changed, 68 insertions, 204 deletions

diff --git a/lib/libc/arch/alpha/gen/fabs.S b/lib/libc/arch/alpha/gen/fabs.S
index 3976b758fb6..e77bec9cbcb 100644
--- a/lib/libc/arch/alpha/gen/fabs.S
+++ b/lib/libc/arch/alpha/gen/fabs.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.S,v 1.7 2011/07/08 22:28:32 martynas Exp $	*/
+/*	$OpenBSD: fabs.S,v 1.8 2013/03/28 18:09:38 martynas Exp $	*/
 /*	$NetBSD: fabs.S,v 1.2 1996/10/17 03:08:05 cgd Exp $	*/
 
 /*
@@ -30,7 +30,7 @@
 
 #include <machine/asm.h>
 
-WEAK_ALIAS(fabsl, fabs)
+STRONG_ALIAS(fabsl, fabs)
 LEAF(fabs, 1)
 	cpys	fzero, fa0, fv0
 	RET
diff --git a/lib/libc/arch/arm/gen/fabs.c b/lib/libc/arch/arm/gen/fabs.c
index 41d840b160e..4e285d7e52b 100644
--- a/lib/libc/arch/arm/gen/fabs.c
+++ b/lib/libc/arch/arm/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.8 2012/12/05 23:19:58 deraadt Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.9 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -31,4 +31,4 @@ fabs(double d)
 	return(d);
 }
 
-__weak_alias(fabsl, fabs);
+__strong_alias(fabsl, fabs);
diff --git a/lib/libc/arch/hppa/gen/fabs.c b/lib/libc/arch/hppa/gen/fabs.c
index 1b5c41b5241..c012f8376fa 100644
--- a/lib/libc/arch/hppa/gen/fabs.c
+++ b/lib/libc/arch/hppa/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.8 2012/12/05 23:19:58 deraadt Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.9 2013/03/28 18:09:38 martynas Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,4 +14,4 @@ fabs(double val)
 	return (val);
 }
 
-__weak_alias(fabsl, fabs);
+__strong_alias(fabsl, fabs);
diff --git a/lib/libc/arch/hppa64/gen/fabs.c b/lib/libc/arch/hppa64/gen/fabs.c
index edd0a38a9d5..aa000c18510 100644
--- a/lib/libc/arch/hppa64/gen/fabs.c
+++ b/lib/libc/arch/hppa64/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.5 2012/12/05 23:19:58 deraadt Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.6 2013/03/28 18:09:38 martynas Exp $	*/
 
 /*
  * Written by Miodrag Vallat.  Public domain
@@ -14,4 +14,4 @@ fabs(double val)
 	return (val);
 }
 
-__weak_alias(fabsl, fabs);
+__strong_alias(fabsl, fabs);
diff --git a/lib/libc/arch/powerpc/gen/fabs.c b/lib/libc/arch/powerpc/gen/fabs.c
index 866a766ea64..708cb6fb320 100644
--- a/lib/libc/arch/powerpc/gen/fabs.c
+++ b/lib/libc/arch/powerpc/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.7 2012/12/05 23:19:58 deraadt Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.8 2013/03/28 18:09:38 martynas Exp $	*/
 
 /*
  * Copyright (c) 2002 Theo de Raadt
@@ -34,4 +34,4 @@ fabs(double x)
 	return (x);
 }
 
-__weak_alias(fabsl, fabs);
+__strong_alias(fabsl, fabs);
diff --git a/lib/libc/arch/sh/gen/fabs.c b/lib/libc/arch/sh/gen/fabs.c
index 24740aed2bd..32412293982 100644
--- a/lib/libc/arch/sh/gen/fabs.c
+++ b/lib/libc/arch/sh/gen/fabs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fabs.c,v 1.10 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fabs.c,v 1.11 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2006 Miodrag Vallat.
  *
@@ -36,4 +36,4 @@ fabs(double d)
 	return (d);
 }
 
-__weak_alias(fabsl, fabs);
+__strong_alias(fabsl, fabs);
diff --git a/lib/libc/arch/sparc/gen/fabs.S b/lib/libc/arch/sparc/gen/fabs.S
index f69a03884df..ff76923bc10 100644
--- a/lib/libc/arch/sparc/gen/fabs.S
+++ b/lib/libc/arch/sparc/gen/fabs.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: fabs.S,v 1.8 2011/07/08 22:28:33 martynas Exp $ */
+/* $OpenBSD: fabs.S,v 1.9 2013/03/28 18:09:38 martynas Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -36,7 +36,7 @@
 
 #include "DEFS.h"
 
-WEAK_ALIAS(fabsl, fabs)
+STRONG_ALIAS(fabsl, fabs)
 ENTRY(fabs)
 	std	%o0, [%sp + 32]		! return value => %f0:f1
 	ldd	[%sp + 32], %f0		! (via kernel %o0/%o1 slot)
diff --git a/lib/libc/arch/vax/gen/fabs.S b/lib/libc/arch/vax/gen/fabs.S
index d50520eebf3..6002cac61d7 100644
--- a/lib/libc/arch/vax/gen/fabs.S
+++ b/lib/libc/arch/vax/gen/fabs.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: fabs.S,v 1.8 2011/07/08 22:28:33 martynas Exp $ */
+/* $OpenBSD: fabs.S,v 1.9 2013/03/28 18:09:38 martynas Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 
 #include "DEFS.h"
 
-WEAK_ALIAS(fabsl,fabs)
+STRONG_ALIAS(fabsl,fabs)
 ENTRY(fabs, 0)
 	movd	4(ap),r0
 	bgeq	1f
diff --git a/lib/libc/arch/vax/gen/fpclassify.c b/lib/libc/arch/vax/gen/fpclassify.c
index 333324d487d..59c7e3b1aa9 100644
--- a/lib/libc/arch/vax/gen/fpclassify.c
+++ b/lib/libc/arch/vax/gen/fpclassify.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpclassify.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fpclassify.c,v 1.6 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <machine/vaxfp.h>
 #include <math.h>
 
@@ -44,9 +42,4 @@ __fpclassifyf(float f)
 	return FP_NORMAL;
 }
 
-#ifdef	lint
-/* PROTOLIB1 */
-int __fpclassifyl(long double);
-#else	/* lint */
-__weak_alias(__fpclassifyl, __fpclassify);
-#endif	/* lint */
+__strong_alias(__fpclassifyl, __fpclassify);
diff --git a/lib/libc/arch/vax/gen/frexp.c b/lib/libc/arch/vax/gen/frexp.c
index e0e3bf0aac7..21b32cddf17 100644
--- a/lib/libc/arch/vax/gen/frexp.c
+++ b/lib/libc/arch/vax/gen/frexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frexp.c,v 1.11 2012/12/05 23:19:59 deraadt Exp $ */
+/*	$OpenBSD: frexp.c,v 1.12 2013/03/28 18:09:38 martynas Exp $ */
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -28,8 +28,6 @@
  * SUCH DAMAGE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <math.h>
 
@@ -60,9 +58,4 @@ frexp(value, eptr)
 	}
 }
 
-#ifdef	lint
-/* PROTOLIB1 */
-long double frexpl(long double, int *);
-#else	/* lint */
-__weak_alias(frexpl, frexp);
-#endif	/* lint */
+__strong_alias(frexpl, frexp);
diff --git a/lib/libc/arch/vax/gen/isfinite.c b/lib/libc/arch/vax/gen/isfinite.c
index 005059cface..019d83d218b 100644
--- a/lib/libc/arch/vax/gen/isfinite.c
+++ b/lib/libc/arch/vax/gen/isfinite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isfinite.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isfinite.c,v 1.6 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,33 +15,24 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <math.h>
 
-/* ARGSUSED */
 int
 __isfinite(double d)
 {
 	return(1);
 }
 
-/* ARGSUSED */
 int
 __isfinitef(float f)
 {
 	return(1);
 }
 
-#ifdef	lint
-/* PROTOLIB1 */
-int __isfinitel(long double);
-#else	/* lint */
-__weak_alias(__isfinitel, __isfinite);
-#endif	/* lint */
+__strong_alias(__isfinitel, __isfinite);
 
 /*
  * 3BSD compatibility aliases.
  */
-__weak_alias(finite, __isfinite);
-__weak_alias(finitef, __isfinitef);
+__strong_alias(finite, __isfinite);
+__strong_alias(finitef, __isfinitef);
diff --git a/lib/libc/arch/vax/gen/isinf.c b/lib/libc/arch/vax/gen/isinf.c
index ca17a92cead..798b8e30c28 100644
--- a/lib/libc/arch/vax/gen/isinf.c
+++ b/lib/libc/arch/vax/gen/isinf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isinf.c,v 1.13 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isinf.c,v 1.14 2013/03/28 18:09:38 martynas Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -29,33 +29,24 @@
  * SUCH DAMAGE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 
-/* ARGSUSED */
 int
 __isinf(double d)
 {
 	return(0);
 }
 
-/* ARGSUSED */
 int
 __isinff(float f)
 {
 	return(0);
 }
 
-#ifdef	lint
-/* PROTOLIB1 */
-int __isinfl(long double);
-#else	/* lint */
-__weak_alias(__isinfl, __isinf);
-#endif	/* lint */
+__strong_alias(__isinfl, __isinf);
 
 /*
  * 3BSD compatibility aliases.
  */
-__weak_alias(isinf, __isinf);
-__weak_alias(isinff, __isinff);
+__strong_alias(isinf, __isinf);
+__strong_alias(isinff, __isinff);
diff --git a/lib/libc/arch/vax/gen/isnan.c b/lib/libc/arch/vax/gen/isnan.c
index 1c715505a46..f5eaff5be73 100644
--- a/lib/libc/arch/vax/gen/isnan.c
+++ b/lib/libc/arch/vax/gen/isnan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnan.c,v 1.7 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isnan.c,v 1.8 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,33 +15,24 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 
-/* ARGSUSED */
 int
 __isnan(double d)
 {
 	return(0);
 }
 
-/* ARGSUSED */
 int
 __isnanf(float f)
 {
 	return(0);
 }
 
-#ifdef	lint
-/* PROTOLIB1 */
-int __isnanl(long double);
-#else	/* lint */
-__weak_alias(__isnanl, __isnan);
-#endif	/* lint */
+__strong_alias(__isnanl, __isnan);
 
 /*
  * 3BSD compatibility aliases.
  */
-__weak_alias(isnan, __isnan);
-__weak_alias(isnanf, __isnanf);
+__strong_alias(isnan, __isnan);
+__strong_alias(isnanf, __isnanf);
diff --git a/lib/libc/arch/vax/gen/isnormal.c b/lib/libc/arch/vax/gen/isnormal.c
index a8b41cabd6e..f84a2417e0c 100644
--- a/lib/libc/arch/vax/gen/isnormal.c
+++ b/lib/libc/arch/vax/gen/isnormal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnormal.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isnormal.c,v 1.6 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/vaxfp.h>
 #include <math.h>
@@ -37,9 +35,4 @@ __isnormalf(float f)
 	return (p->fflt_exp != 0);
 }
 
-#ifdef	lint
-/* PROTOLIB1 */
-int __isnormall(long double);
-#else	/* lint */
-__weak_alias(__isnormall, __isnormal);
-#endif	/* lint */
+__strong_alias(__isnormall, __isnormal);
diff --git a/lib/libc/arch/vax/gen/ldexp.S b/lib/libc/arch/vax/gen/ldexp.S
index 3e28ffde0c7..622e5f5385e 100644
--- a/lib/libc/arch/vax/gen/ldexp.S
+++ b/lib/libc/arch/vax/gen/ldexp.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldexp.S,v 1.8 2008/12/10 08:26:21 deraadt Exp $ */
+/* $OpenBSD: ldexp.S,v 1.9 2013/03/28 18:09:38 martynas Exp $ */
 /*
  * Copyright (c) 1983, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -52,7 +52,7 @@
 
 	.globl	_C_LABEL(errno)
 
-WEAK_ALIAS(ldexpl,ldexp)
+STRONG_ALIAS(ldexpl,ldexp)
 ENTRY(ldexp, R2)
 	movd	4(ap),r0	/* fetch "value" */
 	extzv	$7,$8,r0,r2	/* r2 := biased exponent */
diff --git a/lib/libc/arch/vax/gen/signbit.c b/lib/libc/arch/vax/gen/signbit.c
index f80e201359c..6a823853f97 100644
--- a/lib/libc/arch/vax/gen/signbit.c
+++ b/lib/libc/arch/vax/gen/signbit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signbit.c,v 1.5 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: signbit.c,v 1.6 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/vaxfp.h>
 #include <math.h>
@@ -37,9 +35,4 @@ __signbitf(float f)
 	return p->fflt_sign;
 }
 
-#ifdef	lint
-/* PROTOLIB1 */
-int __signbitl(long double);
-#else	/* lint */
-__weak_alias(__signbitl, __signbit);
-#endif	/* lint */
+__strong_alias(__signbitl, __signbit);
diff --git a/lib/libc/gen/fpclassify.c b/lib/libc/gen/fpclassify.c
index d597531c1ea..c844366199d 100644
--- a/lib/libc/gen/fpclassify.c
+++ b/lib/libc/gen/fpclassify.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fpclassify.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: fpclassify.c,v 1.7 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
@@ -67,10 +65,5 @@ __fpclassifyf(float f)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-int __fpclassifyl(long double);
-#else	/* lint */
-__weak_alias(__fpclassifyl, __fpclassify);
-#endif	/* lint */
+__strong_alias(__fpclassifyl, __fpclassify);
 #endif	/* LDBL_MANT_DIG == 53 */
diff --git a/lib/libc/gen/frexp.c b/lib/libc/gen/frexp.c
index 9fce77b6362..22c4935abc7 100644
--- a/lib/libc/gen/frexp.c
+++ b/lib/libc/gen/frexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frexp.c,v 1.8 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: frexp.c,v 1.9 2013/03/28 18:09:38 martynas Exp $	*/
 
 /*-
  * Copyright (c) 2004 David Schultz <das@FreeBSD.ORG>
@@ -28,8 +28,6 @@
  * $FreeBSD: frexp.c,v 1.1 2004/07/18 21:23:39 das Exp $
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
@@ -69,10 +67,5 @@ frexp(double v, int *ex)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-long double frexpl(long double, int *);
-#else	/* lint */
-__weak_alias(frexpl, frexp);
-#endif	/* lint */
+__strong_alias(frexpl, frexp);
 #endif	/* LDBL_MANT_DIG == 53 */
diff --git a/lib/libc/gen/isfinite.c b/lib/libc/gen/isfinite.c
index 9adda1cc981..7a5a08abc2e 100644
--- a/lib/libc/gen/isfinite.c
+++ b/lib/libc/gen/isfinite.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isfinite.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isfinite.c,v 1.7 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
@@ -39,16 +37,11 @@ __isfinitef(float f)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-int __isfinitel(long double);
-#else	/* lint */
-__weak_alias(__isfinitel, __isfinite);
-#endif	/* lint */
+__strong_alias(__isfinitel, __isfinite);
 #endif	/* LDBL_MANT_DIG == 53 */
 
 /* 
  * 3BSD compatibility aliases.
  */
-__weak_alias(finite, __isfinite);
-__weak_alias(finitef, __isfinitef);
+__strong_alias(finite, __isfinite);
+__strong_alias(finitef, __isfinitef);
diff --git a/lib/libc/gen/isinf.c b/lib/libc/gen/isinf.c
index 264864cbad3..0bff56d337b 100644
--- a/lib/libc/gen/isinf.c
+++ b/lib/libc/gen/isinf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isinf.c,v 1.7 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isinf.c,v 1.8 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
@@ -39,16 +37,11 @@ __isinff(float f)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-int __isinfl(long double);
-#else	/* lint */
-__weak_alias(__isinfl, __isinf);
-#endif	/* lint */
+__strong_alias(__isinfl, __isinf);
 #endif	/* LDBL_MANT_DIG == 53 */
 
 /*
  * 3BSD compatibility aliases.
  */
-__weak_alias(isinf, __isinf);
-__weak_alias(isinff, __isinff);
+__strong_alias(isinf, __isinf);
+__strong_alias(isinff, __isinff);
diff --git a/lib/libc/gen/isnan.c b/lib/libc/gen/isnan.c
index e34849ac480..ee9b850181f 100644
--- a/lib/libc/gen/isnan.c
+++ b/lib/libc/gen/isnan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnan.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isnan.c,v 1.7 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
@@ -39,16 +37,11 @@ __isnanf(float f)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-int __isnanl(long double);
-#else	/* lint */
-__weak_alias(__isnanl, __isnan);
-#endif	/* lint */
+__strong_alias(__isnanl, __isnan);
 #endif	/* LDBL_MANT_DIG == 53 */
 
 /*
  * 3BSD compatibility aliases.
  */
-__weak_alias(isnan, __isnan);
-__weak_alias(isnanf, __isnanf);
+__strong_alias(isnan, __isnan);
+__strong_alias(isnanf, __isnanf);
diff --git a/lib/libc/gen/isnormal.c b/lib/libc/gen/isnormal.c
index 19a43263c79..13d04f2a1be 100644
--- a/lib/libc/gen/isnormal.c
+++ b/lib/libc/gen/isnormal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isnormal.c,v 1.6 2012/12/05 23:19:59 deraadt Exp $	*/
+/*	$OpenBSD: isnormal.c,v 1.7 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
@@ -39,10 +37,5 @@ __isnormalf(float f)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-int __isnormall(long double);
-#else	/* lint */
-__weak_alias(__isnormall, __isnormal);
-#endif	/* lint */
+__strong_alias(__isnormall, __isnormal);
 #endif	/* LDBL_MANT_DIG == 53 */
diff --git a/lib/libc/gen/ldexp.c b/lib/libc/gen/ldexp.c
index 8fd78555a52..38ed29268ba 100644
--- a/lib/libc/gen/ldexp.c
+++ b/lib/libc/gen/ldexp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ldexp.c,v 1.6 2012/12/05 23:20:00 deraadt Exp $	*/
+/*	$OpenBSD: ldexp.c,v 1.7 2013/03/28 18:09:38 martynas Exp $	*/
 /* @(#)s_scalbn.c 5.1 93/09/24 */
 /* @(#)fdlibm.h 5.1 93/09/24 */
 /*
@@ -12,8 +12,6 @@
  * ====================================================
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/endian.h>
 #include <float.h>
@@ -124,10 +122,5 @@ ldexp(double x, int n)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-long double ldexpl(long double, int);
-#else	/* lint */
-__weak_alias(ldexpl, ldexp);
-#endif	/* lint */
+__strong_alias(ldexpl, ldexp);
 #endif	/* LDBL_MANT_DIG == 53 */
diff --git a/lib/libc/gen/modf.c b/lib/libc/gen/modf.c
index fde7cd82bab..586ed28a49a 100644
--- a/lib/libc/gen/modf.c
+++ b/lib/libc/gen/modf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: modf.c,v 1.4 2011/07/08 22:48:19 martynas Exp $	*/
+/*	$OpenBSD: modf.c,v 1.5 2013/03/28 18:09:38 martynas Exp $	*/
 /*	$NetBSD: modf.c,v 1.1 1995/02/10 17:50:25 cgd Exp $	*/
 
 /*
@@ -28,8 +28,6 @@
  * rights to redistribute these changes.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <errno.h>
@@ -107,10 +105,5 @@ modf(double val, double *iptr)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-long double frexpl(long double, int *);
-#else	/* lint */
-__weak_alias(modfl, modf);
-#endif	/* lint */
+__strong_alias(modfl, modf);
 #endif	/* LDBL_MANT_DIG == 53 */
diff --git a/lib/libc/gen/signbit.c b/lib/libc/gen/signbit.c
index 2dbcd84a2a5..acb3de33dbc 100644
--- a/lib/libc/gen/signbit.c
+++ b/lib/libc/gen/signbit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: signbit.c,v 1.5 2012/12/05 23:20:00 deraadt Exp $	*/
+/*	$OpenBSD: signbit.c,v 1.6 2013/03/28 18:09:38 martynas Exp $	*/
 /*
  * Copyright (c) 2008 Martynas Venckus <martynas@openbsd.org>
  *
@@ -15,8 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* LINTLIBRARY */
-
 #include <sys/types.h>
 #include <machine/ieee.h>
 #include <float.h>
@@ -39,10 +37,5 @@ __signbitf(float f)
 }
 
 #if	LDBL_MANT_DIG == 53
-#ifdef	lint
-/* PROTOLIB1 */
-int __signbitl(long double);
-#else	/* lint */
-__weak_alias(__signbitl, __signbit);
-#endif	/* lint */
+__strong_alias(__signbitl, __signbit);
 #endif	/* LDBL_MANT_DIG == 53 */
diff --git a/lib/libc/shlib_version b/lib/libc/shlib_version
index 8ae224587de..10f54f6d920 100644
--- a/lib/libc/shlib_version
+++ b/lib/libc/shlib_version
@@ -1,4 +1,4 @@
-major=66
-minor=2
+major=67
+minor=0
 # note: If changes were made to include/thread_private.h or if system
 # calls were added/changed then librthread/shlib_version also be updated.
diff --git a/lib/libc/stdlib/strtoll.c b/lib/libc/stdlib/strtoll.c
index 37379252e36..4bcc5565be2 100644
--- a/lib/libc/stdlib/strtoll.c
+++ b/lib/libc/stdlib/strtoll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strtoll.c,v 1.6 2005/11/10 10:00:17 espie Exp $ */
+/* $OpenBSD: strtoll.c,v 1.7 2013/03/28 18:09:38 martynas Exp $ */
 /*-
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
@@ -141,13 +141,4 @@ strtoll(const char *nptr, char **endptr, int base)
 	return (acc);
 }
 
-#ifdef __weak_alias
-__weak_alias(strtoq, strtoll);
-#else
-quad_t
-strtoq(const char *nptr, char **endptr, int base)
-{
-
-        return ((quad_t)strtoll(nptr, endptr, base));
-}
-#endif
+__strong_alias(strtoq, strtoll);
diff --git a/lib/libc/stdlib/strtoull.c b/lib/libc/stdlib/strtoull.c
index 37859776f9b..28f613a0875 100644
--- a/lib/libc/stdlib/strtoull.c
+++ b/lib/libc/stdlib/strtoull.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strtoull.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*	$OpenBSD: strtoull.c,v 1.6 2013/03/28 18:09:38 martynas Exp $ */
 /*-
  * Copyright (c) 1992 The Regents of the University of California.
  * All rights reserved.
@@ -103,13 +103,4 @@ strtoull(const char *nptr, char **endptr, int base)
 	return (acc);
 }
 
-#ifdef __weak_alias
-__weak_alias(strtouq, strtoull);
-#else
-u_quad_t
-strtouq(const char *nptr, char **endptr, int base)
-{
-
-	return ((u_quad_t)strtoull(nptr, endptr, base));
-}
-#endif
+__strong_alias(strtouq, strtoull);