summaryrefslogtreecommitdiff
path: root/libc/stdlib
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-03-07 19:31:25 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-03-07 19:31:25 +0000
commit166cc47deaa1da2477806e3bb9a1c6bd0b94ff52 (patch)
tree12c479e061d53a1ec8c9bf0451e84ac191323792 /libc/stdlib
parent68958b4bf50cfd014e72d20fbe187f4d1ddee22f (diff)
Merge changes between r17384 and r17457 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17458 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/stdlib')
-rw-r--r--libc/stdlib/Makefile3
-rw-r--r--libc/stdlib/tst-strtod.c5
2 files changed, 1 insertions, 7 deletions
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index b6c97aeb2..2200dd07d 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -69,8 +69,6 @@ aux = grouping groupingwc tens_in_limb
# linked against when the shared library will be used.
static-only-routines = atexit at_quick_exit
-distribute := exit.h grouping.h abort-instr.h isomac.c tst-fmtmsg.sh \
- allocalim.h
test-srcs-$(OPTION_EGLIBC_FMTMSG) := tst-fmtmsg
tests := tst-strtol tst-strtod testrand testsort testdiv \
test-canon test-canon2 tst-strtoll tst-environ \
@@ -99,7 +97,6 @@ routines := $(strip $(routines) $(mpn-routines)) \
dbl2mpn ldbl2mpn \
mpn2flt mpn2dbl mpn2ldbl
aux += fpioconst mp_clz_tab
-distribute := $(distribute) $(mpn-headers) fpioconst.h tst-putenvmod.c
tests-extras += tst-putenvmod
extra-test-objs += tst-putenvmod.os
diff --git a/libc/stdlib/tst-strtod.c b/libc/stdlib/tst-strtod.c
index b4cf347e4..5b3cd0cdf 100644
--- a/libc/stdlib/tst-strtod.c
+++ b/libc/stdlib/tst-strtod.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1996-2001,2003,2009,2011 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2012 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
@@ -65,12 +65,9 @@ static const struct ltest tests[] =
{ "0x0.8p-1022",
1.11253692925360069154511635866620203210960799023116591527666e-308,
'\0', ERANGE },
-#if __GNUC_PREREQ(2,96)
- /* For older GCC release HUGE_VAL is not a constant. */
{ "Inf", HUGE_VAL, '\0', 0 },
{ "-Inf", -HUGE_VAL, '\0', 0 },
{ "+InFiNiTy", HUGE_VAL, '\0', 0 },
-#endif
{ "0x80000Ap-23", 0x80000Ap-23, '\0', 0 },
{ "1e-324", 0, '\0', ERANGE },
{ NULL, 0, '\0', 0 }