diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 225c11a8385b..4e7439155b8a 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -52,7 +52,7 @@ ARCH_SRCS = s_copysign.S s_copysignf.S ARCH= i387 ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_fmod.S e_log.S e_log10.S \ e_remainder.S e_scalb.S e_sqrt.S s_atan.S s_ceil.S s_copysign.S \ - s_cos.S s_finite.S s_floor.S s_ilogb.S s_logb.S \ + s_cos.S s_finite.S s_floor.S s_logb.S \ s_rint.S s_scalbn.S s_significand.S s_sin.S s_tan.S # Broken: # ARCH_SRCS+= s_log1p.S diff --git a/lib/msun/i387/s_ilogb.S b/lib/msun/i387/s_ilogb.S deleted file mode 100644 index 34497a8f4040..000000000000 --- a/lib/msun/i387/s_ilogb.S +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 1994 Winning Strategies, Inc. - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Winning Strategies, Inc. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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. - */ - -/* - * Written by: - * J.T. Conklin (jtc@wimsey.com), Winning Strategies, Inc. - */ - -#include -#include - -RCSID("$FreeBSD$") - -#define FP_ILOGB0 (-__INT_MAX) -#define FP_ILOGBNAN __INT_MAX -#define FP_ILOGBINF __INT_MAX - -ENTRY(ilogb) - pushl %ebp - movl %esp,%ebp - subl $4,%esp - - fldl 8(%ebp) - fxtract - fstp %st(0) - - fistpl -4(%ebp) - movl -4(%ebp),%eax - - /* fistpl yields __INT_MIN for NaN, Inf and 0. */ - cmpl $__INT_MIN,%eax - je .L2 - -.L1: - leave - ret - -.L2: - fldl 8(%ebp) - fldz - fucompp - fnstsw %ax - sahf - jp .L3 - jz .L4 - - movl $FP_ILOGBINF,%eax - jmp .L1 - -.L3: - movl $FP_ILOGBNAN,%eax - jmp .L1 - -.L4: - movl $FP_ILOGB0,%eax - jmp .L1