merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 01c73c94bcd702722b022b6c40a109005e4447b0..f92fef840e17a7e25c1a6e37e5e2d13506e16176 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-18  Stuart Griffith  <Stuart_Griffith@credence.com>
+
+       * strtod.c (strtod): Increment 8 chars, not 7, when `infinity'
+       seen.
+
 2002-03-12  Mark Mitchell  <mark@codesourcery.com>
 
        * cp-demangle.c: Add libgcc exception to cp-demangle.c copyright

diff --git a/libiberty/strtod.c b/libiberty/strtod.c
index 6b69ccfa8d206c6594c7b668362a85fbf7b120a6..97fc9339344b98aedffef66948d05815ab314bb1 100644 (file)
--- a/libiberty/strtod.c
+++ b/libiberty/strtod.c
@@ -1,5 +1,5 @@
 /* Implementation of strtod for systems with atof.
-   Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1995, 2002 Free Software Foundation, Inc.
 
 This file is part of the libiberty library.  This library is free
 software; you can redistribute it and/or modify it under the
@@ -75,7 +75,7 @@ strtod (str, ptr)
          && (p[6] == 't' || p[6] == 'T')
          && (p[7] == 'y' || p[7] == 'Y'))
        {
-         *ptr = p + 7;
+         *ptr = p + 8;
          return atof (str);
        }
       else