Merge branch 'master' of git://sourceware.org/git/glibc

This commit is contained in:
Andreas Jaeger 2012-04-24 22:10:04 +02:00
commit f23f459dd3
6 changed files with 37 additions and 142 deletions

View File

@ -3,6 +3,20 @@
* Makerules (common-clean): Also remove gen-as-const-headers
files.
2012-04-24 Joseph Myers <joseph@codesourcery.com>
* Makerules (native-compile): Do not change working directory for
build. Use $(OUTPUT_OPTION) in command.
(ALL_BUILD_CFLAGS): Use $(common-objpfx) to find config.h.
2012-04-24 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
[BZ #13886]
* sysdeps/powerpc/powerpc64/fpu/s_floorl.S: Delete file. Use the
sysdeps/ieee754/ldbl-128ibm/s_floorl.c version instead.
* math/libm-test.inc (floor_test): Add more tests.
* sysdeps/powerpc/fpu/libm-test-ulps: Update for pow tests.
2012-04-24 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/getdents.c: Remove file.

View File

@ -1114,17 +1114,15 @@ install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \
endif
install: install-no-libc.a-nosubdir
# Command to compile $< in $(objdir) using the native libraries.
# Command to compile $< using the native libraries.
define native-compile
$(make-target-directory)
$(patsubst %/,cd % &&,$(objpfx)) \
$(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \
$(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F)
$< $(OUTPUT_OPTION)
endef
# We always want to use configuration definitions.
# Note that this is only used for commands running in $(objpfx).
ALL_BUILD_CFLAGS = $(BUILD_CFLAGS) -include $(..)config.h
ALL_BUILD_CFLAGS = $(BUILD_CFLAGS) -include $(common-objpfx)config.h
# Support the GNU standard name for this target.
.PHONY: check

8
NEWS
View File

@ -19,10 +19,10 @@ Version 2.16
13551, 13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637,
13656, 13658, 13673, 13691, 13695, 13704, 13705, 13706, 13726, 13738,
13739, 13760, 13761, 13786, 13792, 13806, 13824, 13840, 13841, 13844,
13846, 13851, 13852, 13854, 13871, 13872, 13873, 13879, 13883, 13892,
13895, 13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918,
13919, 13920, 13921, 13926, 13927, 13928, 13938, 13963, 13967, 13970,
13973
13846, 13851, 13852, 13854, 13871, 13872, 13873, 13879, 13883, 13886,
13892, 13895, 13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917,
13918, 13919, 13920, 13921, 13926, 13927, 13928, 13938, 13963, 13967,
13970, 13973
* ISO C11 support:

View File

@ -3442,6 +3442,9 @@ floor_test (void)
TEST_f_f (floor, 10141204801825835211973625643008.5L, 10141204801825835211973625643008.0L);
TEST_f_f (floor, 10141204801825835211973625643008.75L, 10141204801825835211973625643008.0L);
TEST_f_f (floor, 10141204801825835211973625643009.5L, 10141204801825835211973625643009.0L);
TEST_f_f (floor, 0xf.ffffffffffffff8p+47L, 0xf.fffffffffffep+47L);
TEST_f_f (floor, -0x8.000000000000004p+48L, -0x8.000000000001p+48L);
#endif
END (floor);

View File

@ -1488,6 +1488,17 @@ Test "log2 (e) == M_LOG2El":
ildouble: 1
ldouble: 1
# pow
Test "pow (0x0.ffffffp0, -0x1p24) == 2.7182819094701610539628664526874952929416":
float: 1
ifloat: 1
Test "pow (0x0.ffffffp0, 0x1p24) == 0.3678794302077803437135155590023422899744":
float: 1
ifloat: 1
Test "pow (0x1.000002p0, 0x1p24) == 7.3890552180866447284268641248075832310141":
float: 1
ifloat: 1
# pow_downward
Test "pow_downward (1.0625, 1.125) == 1.070582293028761362162622578677070098674":
ildouble: 1
@ -2448,6 +2459,8 @@ ildouble: 1
ldouble: 1
Function: "pow":
float: 1
ifloat: 1
ildouble: 1
ldouble: 1

View File

@ -1,133 +0,0 @@
/* long double floor function.
IBM extended format long double version.
Copyright (C) 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
#include <math_ldbl_opt.h>
.section ".toc","aw"
.LC0: /* 2**52 */
.tc FD_43300000_0[TC],0x4330000000000000
.section ".text"
/* long double [fp1,fp2] floorl (long double x [fp1,fp2])
IEEE 1003.1 floor function.
PowerPC64 long double uses the IBM extended format which is
represented two 64-floating point double values. The values are
non-overlapping giving an effective precision of 106 bits. The first
double contains the high order bits of mantisa and is always rounded
to represent a normal rounding of long double to double. Since the
long double value is sum of the high and low values, the low double
normally has the opposite sign to compensate for the this rounding.
For long double there are two cases:
1) |x| < 2**52, all the integer bits are in the high double.
floor the high double and set the low double to -0.0.
2) |x| >= 2**52, Rounding involves both doubles.
See the comment before lable .L2 for details.
*/
ENTRY (__floorl)
mffs fp11 /* Save current FPU rounding mode. */
lfd fp13,.LC0@toc(2)
fabs fp0,fp1
fabs fp9,fp2
fsub fp12,fp13,fp13 /* generate 0.0 */
fcmpu cr7,fp0,fp13 /* if (fabs(x) > TWO52) */
fcmpu cr6,fp1,fp12 /* if (x > 0.0) */
bnl- cr7,.L2
mtfsfi 7,3 /* Set rounding mode toward -inf. */
fneg fp2,fp12 /* set low double to -0.0. */
ble- cr6,.L0
fadd fp1,fp1,fp13 /* x+= TWO52; */
fsub fp1,fp1,fp13 /* x-= TWO52; */
fcmpu cr5,fp1,fp12 /* if (x > 0.0) */
mtfsf 0x01,fp11 /* restore previous rounding mode. */
bnelr+ cr5
fmr fp1,fp12 /* x must be +0.0 for the 0.0 case. */
blr
.L0:
bge- cr6,.L1 /* if (x < 0.0) */
fsub fp1,fp1,fp13 /* x-= TWO52; */
fadd fp1,fp1,fp13 /* x+= TWO52; */
.L1:
mtfsf 0x01,fp11 /* restore previous rounding mode. */
blr
/* The high double is > TWO52 so we need to round the low double and
perhaps the high double. In this case we have to round the low
double and handle any adjustment to the high double that may be
caused by rounding (up). This is complicated by the fact that the
high double may already be rounded and the low double may have the
opposite sign to compensate.This gets a bit tricky so we use the
following algorithm:
tau = floor(x_high/TWO52);
x0 = x_high - tau;
x1 = x_low + tau;
r1 = rint(x1);
y_high = x0 + r1;
y_low = x0 - y_high + r1;
return y; */
.L2:
fcmpu cr7,fp9,fp13 /* if (|x_low| > TWO52) */
fcmpu cr0,fp9,fp12 /* || (|x_low| == 0.0) */
fcmpu cr5,fp2,fp12 /* if (x_low > 0.0) */
bgelr- cr7 /* return x; */
beqlr- cr0
mtfsfi 7,3 /* Set rounding mode toward -inf. */
fdiv fp8,fp1,fp13 /* x_high/TWO52 */
bng- cr6,.L6 /* if (x > 0.0) */
fctidz fp0,fp8
fcfid fp8,fp0 /* tau = floor(x_high/TWO52); */
bng cr5,.L4 /* if (x_low > 0.0) */
fmr fp3,fp1
fmr fp4,fp2
b .L5
.L4: /* if (x_low < 0.0) */
fsub fp3,fp1,fp8 /* x0 = x_high - tau; */
fadd fp4,fp2,fp8 /* x1 = x_low + tau; */
.L5:
fadd fp5,fp4,fp13 /* r1 = r1 + TWO52; */
fsub fp5,fp5,fp13 /* r1 = r1 - TWO52; */
b .L9
.L6: /* if (x < 0.0) */
fctidz fp0,fp8
fcfid fp8,fp0 /* tau = floor(x_high/TWO52); */
bnl cr5,.L7 /* if (x_low < 0.0) */
fmr fp3,fp1
fmr fp4,fp2
b .L8
.L7: /* if (x_low > 0.0) */
fsub fp3,fp1,fp8 /* x0 = x_high - tau; */
fadd fp4,fp2,fp8 /* x1 = x_low + tau; */
.L8:
fsub fp5,fp4,fp13 /* r1-= TWO52; */
fadd fp5,fp5,fp13 /* r1+= TWO52; */
.L9:
mtfsf 0x01,fp11 /* restore previous rounding mode. */
fadd fp1,fp3,fp5 /* y_high = x0 + r1; */
fsub fp2,fp3,fp1 /* y_low = x0 - y_high + r1; */
fadd fp2,fp2,fp5
blr
END (__floorl)
long_double_symbol (libm, __floorl, floorl)