[src/trunk]: src/lib/libm Drop s_scalbnl.c (and s_scalbln.S as side effect) a...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f82da6478fad
branches:  trunk
changeset: 786444:f82da6478fad
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sun Apr 28 14:46:14 2013 +0000

description:
Drop s_scalbnl.c (and s_scalbln.S as side effect) and provide scalbnl in
s_scalbln.c.

diffstat:

 lib/libm/Makefile              |   5 +-
 lib/libm/arch/i387/s_scalbln.S |   1 -
 lib/libm/src/s_scalbln.c       |  75 ------------------------------------------
 lib/libm/src/s_scalbnl.c       |  12 +++++-
 4 files changed, 11 insertions(+), 82 deletions(-)

diffs (136 lines):

diff -r 5d0749653b73 -r f82da6478fad lib/libm/Makefile
--- a/lib/libm/Makefile Sun Apr 28 14:44:46 2013 +0000
+++ b/lib/libm/Makefile Sun Apr 28 14:46:14 2013 +0000
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.135 2013/04/27 22:58:15 joerg Exp $
+#  $NetBSD: Makefile,v 1.136 2013/04/28 14:46:14 joerg Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -69,8 +69,7 @@
 .PATH: ${.CURDIR}/arch/i387
 
 COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c \
-       s_nearbyint.c s_rintl.c \
-       s_scalbln.c # s_nan.c
+       s_nearbyint.c s_rintl.c
 COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
 
 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
diff -r 5d0749653b73 -r f82da6478fad lib/libm/arch/i387/s_scalbln.S
--- a/lib/libm/arch/i387/s_scalbln.S    Sun Apr 28 14:44:46 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/* This file is intentionally empty */
diff -r 5d0749653b73 -r f82da6478fad lib/libm/src/s_scalbln.c
--- a/lib/libm/src/s_scalbln.c  Sun Apr 28 14:44:46 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*     $NetBSD: s_scalbln.c,v 1.5 2013/04/27 17:20:36 joerg Exp $      */
-
-/*-
- * Copyright (c) 2004 David Schultz <das%FreeBSD.ORG@localhost>
- * All rights reserved.
- *
- * 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 AUTHOR 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 AUTHOR 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 <sys/cdefs.h>
-#if 0
-__FBSDID("$FreeBSD: src/lib/msun/src/s_scalbln.c,v 1.2 2005/03/07 04:57:50 das Exp $");
-#else
-__RCSID("$NetBSD: s_scalbln.c,v 1.5 2013/04/27 17:20:36 joerg Exp $");
-#endif
-
-#include "namespace.h"
-
-#include <limits.h>
-#include <math.h>
-
-__weak_alias(scalbln, _scalbln)
-double
-scalbln (double x, long n)
-{
-
-       if (n > INT_MAX)
-               n = INT_MAX;
-       else if (n < INT_MIN)
-               n = INT_MIN;
-       return (scalbn(x, n));
-}
-
-__weak_alias(scalblnf, _scalblnf)
-float
-scalblnf (float x, long n)
-{
-
-       if (n > INT_MAX)
-               n = INT_MAX;
-       else if (n < INT_MIN)
-               n = INT_MIN;
-       return (scalbnf(x, n));
-}
-
-__weak_alias(scalblnl, _scalblnl)
-
-long double
-scalblnl (long double x, long n)
-{
-       if (n > INT_MAX)
-               n = INT_MAX;
-       else if (n < INT_MIN)
-               n = INT_MIN;
-       return (scalbnl(x, n));
-}
diff -r 5d0749653b73 -r f82da6478fad lib/libm/src/s_scalbnl.c
--- a/lib/libm/src/s_scalbnl.c  Sun Apr 28 14:44:46 2013 +0000
+++ b/lib/libm/src/s_scalbnl.c  Sun Apr 28 14:46:14 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: s_scalbnl.c,v 1.6 2013/04/27 18:43:25 joerg Exp $      */
+/*     $NetBSD: s_scalbnl.c,v 1.7 2013/04/28 14:46:16 joerg Exp $      */
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: s_scalbnl.c,v 1.6 2013/04/27 18:43:25 joerg Exp $");
+__RCSID("$NetBSD: s_scalbnl.c,v 1.7 2013/04/28 14:46:16 joerg Exp $");
 
 #include "namespace.h"
 
@@ -40,7 +40,13 @@
 
 #ifdef __HAVE_LONG_DOUBLE
 
-#ifndef _LP64
+#ifdef _LP64
+long double
+scalbnl(long double x, int n)
+{
+       return scalblnl(x, n);
+}
+#else
 __strong_alias(_scalbnl, _scalblnl)
 #endif