Module Name: src
Committed By: joerg
Date: Fri Nov 14 14:53:17 UTC 2014
Modified Files:
src/lib/libm/arch/vax: n_support.S
src/lib/libm/src: namespace.h s_copysign.c s_copysignl.c
Log Message:
Define copysignl on !long double platforms. Be consistent in the use of
weak aliases.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/lib/libm/arch/vax/n_support.S
cvs rdiff -u -r1.12 -r1.13 src/lib/libm/src/namespace.h
cvs rdiff -u -r1.11 -r1.12 src/lib/libm/src/s_copysign.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/src/s_copysignl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/arch/vax/n_support.S
diff -u src/lib/libm/arch/vax/n_support.S:1.9 src/lib/libm/arch/vax/n_support.S:1.10
--- src/lib/libm/arch/vax/n_support.S:1.9 Sat Mar 15 14:12:56 2014
+++ src/lib/libm/arch/vax/n_support.S Fri Nov 14 14:53:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: n_support.S,v 1.9 2014/03/15 14:12:56 martin Exp $ */
+/* $NetBSD: n_support.S,v 1.10 2014/11/14 14:53:17 joerg Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -32,7 +32,8 @@
#include <machine/asm.h>
WEAK_ALIAS(logbl,logb)
-WEAK_ALIAS(copysignl, copysign)
+WEAK_ALIAS(copysignl, _copysignl)
+WEAK_ALIAS(_copysignl, copysign)
.text
_sccsid:
Index: src/lib/libm/src/namespace.h
diff -u src/lib/libm/src/namespace.h:1.12 src/lib/libm/src/namespace.h:1.13
--- src/lib/libm/src/namespace.h:1.12 Fri Nov 14 03:31:41 2014
+++ src/lib/libm/src/namespace.h Fri Nov 14 14:53:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.12 2014/11/14 03:31:41 christos Exp $ */
+/* $NetBSD: namespace.h,v 1.13 2014/11/14 14:53:17 joerg Exp $ */
#define atan2 _atan2
#define atan2f _atan2f
@@ -46,6 +46,7 @@
#define scalblnf _scalblnf
#define scalblnl _scalblnl
+#define copysignl _copysignl
#define sqrtl _sqrtl
#define cbrtl _cbrtl
#define ceill _ceill
Index: src/lib/libm/src/s_copysign.c
diff -u src/lib/libm/src/s_copysign.c:1.11 src/lib/libm/src/s_copysign.c:1.12
--- src/lib/libm/src/s_copysign.c:1.11 Sun May 26 22:01:54 2002
+++ src/lib/libm/src/s_copysign.c Fri Nov 14 14:53:17 2014
@@ -12,7 +12,7 @@
#include <sys/cdefs.h>
#if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: s_copysign.c,v 1.11 2002/05/26 22:01:54 wiz Exp $");
+__RCSID("$NetBSD: s_copysign.c,v 1.12 2014/11/14 14:53:17 joerg Exp $");
#endif
/*
@@ -24,6 +24,11 @@ __RCSID("$NetBSD: s_copysign.c,v 1.11 20
#include "math.h"
#include "math_private.h"
+#ifndef __HAVE_LONG_DOUBLE
+__strong_alias(_copysignl, copysign)
+__weak_alias(copysignl, copysign)
+#endif
+
double
copysign(double x, double y)
{
Index: src/lib/libm/src/s_copysignl.c
diff -u src/lib/libm/src/s_copysignl.c:1.3 src/lib/libm/src/s_copysignl.c:1.4
--- src/lib/libm/src/s_copysignl.c:1.3 Wed Oct 22 10:32:50 2014
+++ src/lib/libm/src/s_copysignl.c Fri Nov 14 14:53:17 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: s_copysignl.c,v 1.3 2014/10/22 10:32:50 joerg Exp $ */
+/* $NetBSD: s_copysignl.c,v 1.4 2014/11/14 14:53:17 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -26,11 +26,18 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: s_copysignl.c,v 1.3 2014/10/22 10:32:50 joerg Exp $");
+__RCSID("$NetBSD: s_copysignl.c,v 1.4 2014/11/14 14:53:17 joerg Exp $");
+#include "namespace.h"
#include <math.h>
#include <machine/ieee.h>
+#ifdef __HAVE_LONG_DOUBLE
+
+#ifdef __weak_alias
+__weak_alias(copysignl, _copysignl)
+#endif
+
/*
* copysignl(long double x, long double y)
* This function returns a value with the magnitude of x and the sign of y.
@@ -62,3 +69,4 @@ copysignl(long double x, long double y)
return ux.ldblu_ld;
}
#endif
+#endif /* __HAVE_LONG_DOUBLE */
