Locale changes from Bruno Haible <haible@clisp.cons.org>.

1 files changed, 12 insertions, 11 deletions

diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
index 2190a8547c..21f2ad9fac 100644
--- a/gas/config/tc-tic30.c
+++ b/gas/config/tc-tic30.c
@@ -1,5 +1,5 @@
 /* tc-c30.c -- Assembly code for the Texas Instruments TMS320C30
-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
 
    This file is part of GAS, the GNU Assembler.
@@ -25,6 +25,7 @@
    Please help us make it better.  */
 
 #include "as.h"
+#include "safe-ctype.h"
 #include "opcode/tic30.h"
 
 /* Put here all non-digit non-letter charcters that may occur in an
@@ -188,25 +189,25 @@ md_begin ()
 
     for (c = 0; c < 256; c++)
       {
-	if (islower (c) || isdigit (c))
+	if (ISLOWER (c) || ISDIGIT (c))
 	  {
 	    opcode_chars[c] = c;
 	    register_chars[c] = c;
 	  }
-	else if (isupper (c))
+	else if (ISUPPER (c))
 	  {
-	    opcode_chars[c] = tolower (c);
+	    opcode_chars[c] = TOLOWER (c);
 	    register_chars[c] = opcode_chars[c];
 	  }
 	else if (c == ')' || c == '(')
 	  {
 	    register_chars[c] = c;
 	  }
-	if (isupper (c) || islower (c) || isdigit (c))
+	if (ISUPPER (c) || ISLOWER (c) || ISDIGIT (c))
 	  operand_chars[c] = c;
-	if (isdigit (c) || c == '-')
+	if (ISDIGIT (c) || c == '-')
 	  digit_chars[c] = c;
-	if (isalpha (c) || c == '_' || c == '.' || isdigit (c))
+	if (ISALPHA (c) || c == '_' || c == '.' || ISDIGIT (c))
 	  identifier_chars[c] = c;
 	if (c == ' ' || c == '\t')
 	  space_chars[c] = c;
@@ -1267,7 +1268,7 @@ tic30_operand (token)
       ind_buffer[0] = *token;
       for (count = 1; count < strlen (token); count++)
 	{			/* Strip operand */
-	  ind_buffer[buffer_posn] = tolower (*(token + count));
+	  ind_buffer[buffer_posn] = TOLOWER (*(token + count));
 	  if ((*(token + count - 1) == 'a' || *(token + count - 1) == 'A') &&
 	      (*(token + count) == 'r' || *(token + count) == 'R'))
 	    {
@@ -1486,12 +1487,12 @@ tic30_find_parallel_insn (current_line, next_line)
 	    {
 	      if (is_opcode_char (c) && search_status == NONE)
 		{
-		  opcode[char_ptr++] = tolower (c);
+		  opcode[char_ptr++] = TOLOWER (c);
 		  search_status = START_OPCODE;
 		}
 	      else if (is_opcode_char (c) && search_status == START_OPCODE)
 		{
-		  opcode[char_ptr++] = tolower (c);
+		  opcode[char_ptr++] = TOLOWER (c);
 		}
 	      else if (!is_opcode_char (c) && search_status == START_OPCODE)
 		{
@@ -1868,7 +1869,7 @@ char *
 output_invalid (c)
      char c;
 {
-  if (isprint (c))
+  if (ISPRINT (c))
     sprintf (output_invalid_buf, "'%c'", c);
   else
     sprintf (output_invalid_buf, "(0x%x)", (unsigned) c);