Enlist the FreeBSD-CURRENT users as testers of what is to become Gcc 3.1.0.

These bits are taken from the FSF anoncvs repo on 1-Feb-2002 08:20 PST.

1 files changed, 6 insertions, 14 deletions

diff --git a/contrib/gcc/f/target.c b/contrib/gcc/f/target.c
index 5712bdd..11fb0b1 100644
--- a/contrib/gcc/f/target.c
+++ b/contrib/gcc/f/target.c
@@ -1,5 +1,5 @@
 /* target.c -- Implementation File (module.c template V1.0)
-   Copyright (C) 1995-1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
    Contributed by James Craig Burley.
 
 This file is part of GNU Fortran.
@@ -69,7 +69,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* Include files. */
 
 #include "proj.h"
-#include "glimits.j"
+#include "glimits.h"
 #include "target.h"
 #include "bad.h"
 #include "info.h"
@@ -1447,12 +1447,8 @@ ffetarget_integerhex (ffetargetIntegerDefault *val, ffelexToken integer)
   bad_digit = FALSE;
   while (c != '\0')
     {
-      if ((c >= 'A') && (c <= 'F'))
-	c = c - 'A' + 10;
-      else if ((c >= 'a') && (c <= 'f'))
-	c = c - 'a' + 10;
-      else if ((c >= '0') && (c <= '9'))
-	c -= '0';
+      if (hex_p (c))
+	c = hex_value (c);
       else
 	{
 	  bad_digit = TRUE;
@@ -2482,12 +2478,8 @@ ffetarget_typeless_hex (ffetargetTypeless *xvalue, ffelexToken token)
       new_value <<= 4;
       if ((new_value >> 4) != value)
 	overflow = TRUE;
-      if (ISDIGIT (c))
-	new_value += c - '0';
-      else if ((c >= 'A') && (c <= 'F'))
-	new_value += c - 'A' + 10;
-      else if ((c >= 'a') && (c <= 'f'))
-	new_value += c - 'a' + 10;
+      if (hex_p (c))
+	new_value += hex_value (c);
       else
 	bad_digit = TRUE;
       value = new_value;