Make match function globally available to stdlib functions.

	* libc/stdlib/strtod.c (match): Move from here...
	* libc/stdlib/gdtoa-hexnan.c (match): ...to here.
	* libc/stdlib/mprec.h (match): Declare and add __match define.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index d37a378c8d7cce37ccef185e2f60f81d5fd8fd88..27e19a1abd12cf26827ab2ab2cf424b91035c51d 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-20  Corinna Vinschen  <corinna@vinschen.de>
+
+       * libc/stdlib/strtod.c (match): Move from here...
+       * libc/stdlib/gdtoa-hexnan.c (match): ...to here.
+       * libc/stdlib/mprec.h (match): Declare and add __match define.
+
 2015-11-20  Corinna Vinschen  <corinna@vinschen.de>
 
        * libc/stdlib/wcstold.c (_strtold): Drop unused declaration.

diff --git a/newlib/libc/stdlib/gdtoa-hexnan.c b/newlib/libc/stdlib/gdtoa-hexnan.c
index 4630005287f06d4a1e98949272f584a0d5752895..24e3783be122a7170040e6e21536327e212ea76e 100644 (file)
--- a/newlib/libc/stdlib/gdtoa-hexnan.c
+++ b/newlib/libc/stdlib/gdtoa-hexnan.c
@@ -44,6 +44,24 @@ THIS SOFTWARE.
 #include "gdtoa.h"
 
 #ifdef INFNAN_CHECK
+int
+_DEFUN (match, (sp, t),
+       _CONST char **sp _AND
+       char *t)
+{
+       int c, d;
+       _CONST char *s = *sp;
+
+       while( (d = *t++) !=0) {
+               if ((c = *++s) >= 'A' && c <= 'Z')
+                       c += 'a' - 'A';
+               if (c != d)
+                       return 0;
+               }
+       *sp = s + 1;
+       return 1;
+}
+
 static void
 _DEFUN (L_shift, (x, x1, i),
        __ULong *x _AND

diff --git a/newlib/libc/stdlib/mprec.h b/newlib/libc/stdlib/mprec.h
index d4732ca8ce16f3417c5c36160bd00fddf73a580e..8472e7db00b8e9dd38937d88c62a53032909ee5a 100644 (file)
--- a/newlib/libc/stdlib/mprec.h
+++ b/newlib/libc/stdlib/mprec.h
@@ -360,6 +360,7 @@ typedef struct _Bigint _Bigint;
 #define mult   __multiply
 #define pow5mult       __pow5mult
 #define lshift __lshift
+#define match   __match
 #define cmp    __mcmp
 #define diff   __mdiff
 #define ulp    __ulp
@@ -396,6 +397,7 @@ int                 _EXFUN(hi0bits,(__ULong));
 int            _EXFUN(lo0bits,(__ULong *));
 _Bigint *      _EXFUN(d2b,(struct _reent *p, double d, int *e, int *bits));
 _Bigint *      _EXFUN(lshift,(struct _reent *p, _Bigint *b, int k));
+int            _EXFUN(match,(const char**, char*));
 _Bigint *      _EXFUN(diff,(struct _reent *p, _Bigint *a, _Bigint *b));
 int            _EXFUN(cmp,(_Bigint *a, _Bigint *b));
 int            _EXFUN(gethex,(struct _reent *p, _CONST char **sp, _CONST struct FPI *fpi, Long *exp, _Bigint **bp, int sign));     

diff --git a/newlib/libc/stdlib/strtod.c b/newlib/libc/stdlib/strtod.c
index 9b064f4a84513952743ffadfba7d7be9052b0aa0..433dc7f32499cc291ce76d9aeb4674d0874a2816 100644 (file)
--- a/newlib/libc/stdlib/strtod.c
+++ b/newlib/libc/stdlib/strtod.c
@@ -212,27 +212,6 @@ _DEFUN (ULtod, (L, bits, exp, k),
 }
 #endif /* !NO_HEX_FP */
 
-#ifdef INFNAN_CHECK
-static int
-_DEFUN (match, (sp, t),
-       _CONST char **sp _AND
-       char *t)
-{
-       int c, d;
-       _CONST char *s = *sp;
-
-       while( (d = *t++) !=0) {
-               if ((c = *++s) >= 'A' && c <= 'Z')
-                       c += 'a' - 'A';
-               if (c != d)
-                       return 0;
-               }
-       *sp = s + 1;
-       return 1;
-}
-#endif /* INFNAN_CHECK */
-
-
 double
 _DEFUN (_strtod_r, (ptr, s00, se),
        struct _reent *ptr _AND