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

15 files changed, 103 insertions, 73 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 8211fe6..d857495 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,44 @@
+2001-09-18  Bruno Haible  <haible@clisp.cons.org>
+
+	* deffilep.y: Include "safe-ctype.h" instead of <ctype.h>.
+	(def_file_add_directive): Use ISSPACE instead of isspace.
+	(def_lex): Use ISDIGIT/ISXDIGIT/ISALPHA/ISALNUM instead of
+	isdigit/isxdigit/isalpha/isalnum.
+	* emultempl/aix.em: Include "safe-ctype.h" instead of <ctype.h>.
+	(gld${EMULATION_NAME}_read_file): Use ISSPACE instead of isspace.
+	* emultempl/elf32.em: Include "safe-ctype.h" instead of <ctype.h>.
+	(gld${EMULATION_NAME}_place_orphan): Use ISALNUM instead of
+	isalnum.
+	* emultempl/gld960c.em: Include "safe-ctype.h" instead of <ctype.h>.
+	(gld960_set_output_arch): Use ISUPPER/TOLOWER instead of
+	isupper/tolower.
+	* emultempl/sunos.em: Include "safe-ctype.h" instead of <ctype.h>.
+	(gld${EMULATION_NAME}_search_dir): Use ISDIGIT instead of isdigit.
+	* ldctor.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(ctor_prio): Use ISDIGIT instead of isdigit.
+	* ldfile.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(ldfile_open_file_search): Use ISALPHA instead of isalpha.
+	(ldfile_add_arch): Use ISUPPER/TOLOWER instead of
+	isupper/tolower.
+	* ldlang.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(stricpy): Use TOLOWER instead of isupper/tolower.
+	(lang_leave_overlay_section): Use ISALNUM instead of isalnum.
+	* ldlex.l: Include "safe-ctype.h" instead of <ctype.h>.
+	(lex_warn_invalid): Use ISPRINT instead of isprint.
+	* ldmain.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(main): For gettext, also set the LC_CTYPE locate facet.
+	(add_keepsyms_file): Use ISSPACE instead of isspace.
+	* lexsup.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(is_num, parse_args): Use ISDIGIT instead of isdigit.
+	* mpw-elfmips.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(gldelf32ebmip_place_orphan): Use ISALNUM instead of isalnum.
+	* mpw-eppcmac.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(gldppcmacos_read_file): Use ISSPACE instead of isspace.
+	* pe-dll.c: Include "safe-ctype.h" instead of <ctype.h>.
+	(quoteput): Use ISSPACE instead of isspace.
+	(pe_dll_generate_implib, pe_process_import_defs): Use ISALNUM
+	instead of isalnum.
+
 2001-09-18  Alan Modra  <amodra@bigpond.net.au>
 
 	* deffilep.y (def_stash_module): Constify "name" param.
diff --git a/ld/deffilep.y b/ld/deffilep.y
index 2121da0..51d17f8 100644
--- a/ld/deffilep.y
+++ b/ld/deffilep.y
@@ -20,8 +20,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
-#include <ctype.h>
 #include "libiberty.h"
+#include "safe-ctype.h"
 #include "bfd.h"
 #include "sysdep.h"
 #include "ld.h"
@@ -572,10 +572,10 @@ def_file_add_directive (my_def, param, len)
 
   while (param < pend)
     {
-      while (param < pend && isspace (*param))
+      while (param < pend && ISSPACE (*param))
 	param++;
       for (tend = param + 1;
-	   tend < pend && !(isspace (tend[-1]) && *tend == '-');
+	   tend < pend && !(ISSPACE (tend[-1]) && *tend == '-');
 	   tend++);
 
       for (i = 0; diropts[i].param; i++)
@@ -949,10 +949,10 @@ def_lex ()
   /* must be something else */
   saw_newline = 0;
 
-  if (isdigit (c))
+  if (ISDIGIT (c))
     {
       bufptr = 0;
-      while (c != EOF && (isxdigit (c) || (c == 'x')))
+      while (c != EOF && (ISXDIGIT (c) || (c == 'x')))
 	{
 	  put_buf (c);
 	  c = def_getc ();
@@ -966,10 +966,10 @@ def_lex ()
       return NUMBER;
     }
 
-  if (isalpha (c) || strchr ("$:-_?", c))
+  if (ISALPHA (c) || strchr ("$:-_?", c))
     {
       bufptr = 0;
-      while (c != EOF && (isalnum (c) || strchr ("$:-_?/@", c)))
+      while (c != EOF && (ISALNUM (c) || strchr ("$:-_?/@", c)))
 	{
 	  put_buf (c);
 	  c = def_getc ();
diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em
index 775a678..eb01b66 100644
--- a/ld/emultempl/aix.em
+++ b/ld/emultempl/aix.em
@@ -36,12 +36,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 #include "getopt.h"
 #include "obstack.h"
 #include "bfdlink.h"
 
-#include <ctype.h>
-
 #include "ld.h"
 #include "ldmain.h"
 #include "ldmisc.h"
@@ -950,7 +949,7 @@ gld${EMULATION_NAME}_read_file (filename, import)
       ++lineno;
 
       s = (char *) obstack_base (o);
-      while (isspace ((unsigned char) *s))
+      while (ISSPACE (*s))
 	++s;
       if (*s == '\0'
 	  || *s == '*'
@@ -965,7 +964,7 @@ gld${EMULATION_NAME}_read_file (filename, import)
       if (*s == '#' && s[1] == '!')
 	{
 	  s += 2;
-	  while (isspace ((unsigned char) *s))
+	  while (ISSPACE (*s))
 	    ++s;
 	  if (*s == '\0')
 	    {
@@ -986,7 +985,8 @@ gld${EMULATION_NAME}_read_file (filename, import)
 	      keep = true;
 	      imppath = s;
 	      file = NULL;
-	      while (! isspace ((unsigned char) *s) && *s != '(' && *s != '\0')
+	      while (! ISSPACE (*s)
+		     && *s != '(' && *s != '\0')
 		{
 		  if (*s == '/')
 		    file = s + 1;
@@ -1006,7 +1006,7 @@ gld${EMULATION_NAME}_read_file (filename, import)
 		}
 	      cs = *s;
 	      *s = '\0';
-	      while (isspace ((unsigned char) cs))
+	      while (ISSPACE (cs))
 		{
 		  ++s;
 		  cs = *s;
@@ -1042,7 +1042,7 @@ gld${EMULATION_NAME}_read_file (filename, import)
 	  syscall_flag = 0;
 	  address = (bfd_vma) -1;
 
-	  while (! isspace ((unsigned char) *s) && *s != '\0')
+	  while (! ISSPACE (*s) && *s != '\0')
 	    ++s;
 	  if (*s != '\0')
 	    {
@@ -1050,16 +1050,16 @@ gld${EMULATION_NAME}_read_file (filename, import)
 
 	      *s++ = '\0';
 
-	      while (isspace ((unsigned char) *s))
+	      while (ISSPACE (*s))
 		++s;
 
 	      se = s;
-	      while (! isspace ((unsigned char) *se) && *se != '\0')
+	      while (! ISSPACE (*se) && *se != '\0')
 		++se;
 	      if (*se != '\0')
 		{
 		  *se++ = '\0';
-		  while (isspace ((unsigned char) *se))
+		  while (ISSPACE (*se))
 		    ++se;
 		  if (*se != '\0')
 		    einfo ("%s%d: warning: syntax error in import/export file\n",
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 0e5cd99..f2011ce 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -38,8 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "libiberty.h"
-
-#include <ctype.h>
+#include "safe-ctype.h"
 
 #include "bfdlink.h"
 
@@ -1194,7 +1193,7 @@ gld${EMULATION_NAME}_place_orphan (file, s)
       /* If the name of the section is representable in C, then create
 	 symbols to mark the start and the end of the section.  */
       for (ps = outsecname; *ps != '\0'; ps++)
-	if (! isalnum ((unsigned char) *ps) && *ps != '_')
+	if (! ISALNUM (*ps) && *ps != '_')
 	  break;
       if (*ps == '\0')
 	{
diff --git a/ld/emultempl/gld960c.em b/ld/emultempl/gld960c.em
index 46d6e87..2fdabe9 100644
--- a/ld/emultempl/gld960c.em
+++ b/ld/emultempl/gld960c.em
@@ -26,10 +26,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  */
 
 
-#include <ctype.h>
 #include "bfd.h"
 #include "sysdep.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 #include "bfdlink.h"
 
 #include "ld.h"
@@ -96,8 +96,7 @@ gld960_set_output_arch()
 
       s = concat ("i960:", ldfile_output_machine_name, (char *) NULL);
       for (s1 = s; *s1 != '\0'; s1++)
-	if (isupper ((unsigned char) *s1))
-	  *s1 = tolower ((unsigned char) *s1);
+	*s1 = TOLOWER (*s1);
       ldfile_set_output_arch (s);
       free (s);
     }
diff --git a/ld/emultempl/sunos.em b/ld/emultempl/sunos.em
index d2f62e9..17cd407 100644
--- a/ld/emultempl/sunos.em
+++ b/ld/emultempl/sunos.em
@@ -32,12 +32,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define TARGET_IS_${EMULATION_NAME}
 
-#include <ctype.h>
-
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 
 #include "ld.h"
 #include "ldmain.h"
@@ -311,13 +310,13 @@ gld${EMULATION_NAME}_search_dir (dirname, filename, found_static)
       if (entry->d_name[6 + len] == '\0')
 	;
       else if (entry->d_name[6 + len] == '.'
-	       && isdigit ((unsigned char) entry->d_name[7 + len]))
+	       && ISDIGIT (entry->d_name[7 + len]))
 	;
       else
 	continue;
 
       for (s = entry->d_name + 6 + len; *s != '\0'; s++)
-	if (*s != '.' && ! isdigit ((unsigned char) *s))
+	if (*s != '.' && ! ISDIGIT (*s))
 	  break;
       if (*s != '\0')
 	continue;
diff --git a/ld/ldctor.c b/ld/ldctor.c
index 1c8439b..9e79921 100644
--- a/ld/ldctor.c
+++ b/ld/ldctor.c
@@ -1,5 +1,5 @@
 /* ldctor.c -- constructor support routines
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
    By Steve Chamberlain <sac@cygnus.com>
 
@@ -23,8 +23,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
-
-#include <ctype.h>
+#include "safe-ctype.h"
 
 #include "ld.h"
 #include "ldexp.h"
@@ -146,7 +145,7 @@ ctor_prio (name)
     return -1;
   if (name[1] != 'I' && name[1] != 'D')
     return -1;
-  if (! isdigit ((unsigned char) name[3]))
+  if (! ISDIGIT (name[3]))
     return -1;
 
   return atoi (name + 3);
diff --git a/ld/ldfile.c b/ld/ldfile.c
index 001f71a..039a648 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -24,6 +24,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfdlink.h"
+#include "safe-ctype.h"
 #include "ld.h"
 #include "ldmisc.h"
 #include "ldexp.h"
@@ -35,8 +36,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ldemul.h"
 #include "libiberty.h"
 
-#include <ctype.h>
-
 const char *ldfile_input_filename;
 boolean ldfile_assumed_script = false;
 const char *ldfile_output_machine_name = "";
@@ -190,7 +189,7 @@ ldfile_open_file_search (arch, entry, lib, suffix)
       else if (entry->filename[0] == '/' || entry->filename[0] == '.'
 #if defined (__MSDOS__) || defined (_WIN32)
 	       || entry->filename[0] == '\\'
-	       || (isalpha (entry->filename[0])
+	       || (ISALPHA (entry->filename[0])
 	           && entry->filename[1] == ':')
 #endif
 	  )
@@ -426,8 +425,7 @@ ldfile_add_arch (in_name)
   new->next = (search_arch_type *) NULL;
   while (*name)
     {
-      if (isupper ((unsigned char) *name))
-	*name = tolower ((unsigned char) *name);
+      *name = TOLOWER (*name);
       name++;
     }
   *search_arch_tail_ptr = new;
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 30de02b..db420e8 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -23,6 +23,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "bfd.h"
 #include "sysdep.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 #include "obstack.h"
 #include "bfdlink.h"
 
@@ -39,8 +40,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "fnmatch.h"
 #include "demangle.h"
 
-#include <ctype.h>
-
 /* FORWARDS */
 static lang_statement_union_type *new_statement
   PARAMS ((enum statement_enum, size_t, lang_statement_list_type *));
@@ -1618,12 +1617,7 @@ stricpy (dest, src)
   char c;
 
   while ((c = *src++) != 0)
-    {
-      if (isupper ((unsigned char) c))
-	c = tolower (c);
-
-      *dest++ = c;
-    }
+    *dest++ = TOLOWER (c);
 
   *dest = 0;
 }
@@ -4786,7 +4780,7 @@ lang_leave_overlay_section (fill, phdrs)
   clean = xmalloc (strlen (name) + 1);
   s2 = clean;
   for (s1 = name; *s1 != '\0'; s1++)
-    if (isalnum ((unsigned char) *s1) || *s1 == '_')
+    if (ISALNUM (*s1) || *s1 == '_')
       *s2++ = *s1;
   *s2 = '\0';
 
diff --git a/ld/ldlex.l b/ld/ldlex.l
index eecb902..eebb950 100644
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -1,6 +1,6 @@
 %{
 
-/* Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+/* Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
@@ -28,7 +28,6 @@ This was written by steve chamberlain
 
 #include <ansidecl.h>
 #include <stdio.h>
-#include <ctype.h>
 
 #ifdef MPW
 /* Prevent enum redefinition problems. */
@@ -37,6 +36,7 @@ This was written by steve chamberlain
 
 #include "bfd.h"
 #include "sysdep.h"
+#include "safe-ctype.h"
 #include "ld.h"
 #include "ldgram.h"
 #include "ldmisc.h"
@@ -658,7 +658,7 @@ lex_warn_invalid (where, what)
       einfo ("%F%s: file not recognized: %E\n", ldfile_input_filename);
     }
 
-  if (! isprint ((unsigned char) *what))
+  if (! ISPRINT (*what))
     {
       sprintf (buf, "\\%03o", (unsigned int) *what);
       what = buf;
diff --git a/ld/ldmain.c b/ld/ldmain.c
index f9c5997..e31f276 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -1,5 +1,5 @@
 /* Main program of GNU linker.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
    Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
@@ -23,7 +23,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "bfd.h"
 #include "sysdep.h"
 #include <stdio.h>
-#include <ctype.h>
+#include "safe-ctype.h"
 #include "libiberty.h"
 #include "progress.h"
 #include "bfdlink.h"
@@ -169,6 +169,9 @@ main (argc, argv)
 #if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
   setlocale (LC_MESSAGES, "");
 #endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
+#endif
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
@@ -721,14 +724,14 @@ add_keepsyms_file (filename)
   c = getc (file);
   while (c != EOF)
     {
-      while (isspace (c))
+      while (ISSPACE (c))
 	c = getc (file);
 
       if (c != EOF)
 	{
 	  size_t len = 0;
 
-	  while (! isspace (c) && c != EOF)
+	  while (! ISSPACE (c) && c != EOF)
 	    {
 	      buf[len] = c;
 	      ++len;
diff --git a/ld/lexsup.c b/ld/lexsup.c
index 5183b86..d544df5 100644
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -25,7 +25,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "libiberty.h"
 #include <stdio.h>
 #include <string.h>
-#include <ctype.h>
+#include "safe-ctype.h"
 #include "getopt.h"
 #include "bfdlink.h"
 #include "ld.h"
@@ -419,7 +419,7 @@ is_num (string, min, max, err)
 
   for (; *string; ++string)
     {
-      if (! isdigit (*string))
+      if (! ISDIGIT (*string))
 	{
 	  result = err;
 	  break;
@@ -504,7 +504,7 @@ parse_args (argc, argv)
   for (i = 1; i < argc; i++)
     if (strcmp (argv[i], "-G") == 0
 	&& (i + 1 >= argc
-	    || ! isdigit ((unsigned char) argv[i + 1][0])))
+	    || ! ISDIGIT (argv[i + 1][0])))
       argv[i] = (char *) "--shared";
 
   /* Because we permit long options to start with a single dash, and
diff --git a/ld/mpw-elfmips.c b/ld/mpw-elfmips.c
index 9a84e78..70ceecd 100644
--- a/ld/mpw-elfmips.c
+++ b/ld/mpw-elfmips.c
@@ -26,8 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
-
-#include <ctype.h>
+#include "safe-ctype.h"
 
 #include "bfdlink.h"
 
@@ -667,7 +666,7 @@ gldelf32ebmip_place_orphan (file, s)
   /* If the name of the section is representable in C, then create
      symbols to mark the start and the end of the section.  */
   for (ps = secname; *ps != '\0'; ps++)
-    if (! isalnum (*ps) && *ps != '_')
+    if (! ISALNUM (*ps) && *ps != '_')
       break;
   if (*ps == '\0' && config.build_constructors)
     {
diff --git a/ld/mpw-eppcmac.c b/ld/mpw-eppcmac.c
index 0062ff3..1278097 100644
--- a/ld/mpw-eppcmac.c
+++ b/ld/mpw-eppcmac.c
@@ -1,7 +1,7 @@
 /* This file is is generated by a shell script.  DO NOT EDIT! */
 
 /* AIX emulation code for ppcmacos
-   Copyright 1991, 1993, 1995, 1996, 1997, 2000
+   Copyright 1991, 1993, 1995, 1996, 1997, 2000, 2001
    Free Software Foundation, Inc.
    Written by Steve Chamberlain <sac@cygnus.com>
    AIX support by Ian Lance Taylor <ian@cygnus.com>
@@ -27,11 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 #include "getopt.h"
 #include "bfdlink.h"
 
-#include <ctype.h>
-
 #include "ld.h"
 #include "ldmain.h"
 #include "ldmisc.h"
@@ -708,7 +707,7 @@ gldppcmacos_read_file (filename, import)
       ++lineno;
 
       s = (char *) obstack_base (o);
-      while (isspace ((unsigned char) *s))
+      while (ISSPACE (*s))
 	++s;
       if (*s == '\0'
 	  || *s == '*'
@@ -722,7 +721,7 @@ gldppcmacos_read_file (filename, import)
       if (*s == '#' && s[1] == '!')
 	{
 	  s += 2;
-	  while (isspace ((unsigned char) *s))
+	  while (ISSPACE (*s))
 	    ++s;
 	  if (*s == '\0')
 	    {
@@ -743,7 +742,7 @@ gldppcmacos_read_file (filename, import)
 	      keep = true;
 	      imppath = s;
 	      file = NULL;
-	      while (! isspace ((unsigned char) *s) && *s != '(' && *s != '\0')
+	      while (! ISSPACE (*s) && *s != '(' && *s != '\0')
 		{
 		  if (*s == '/')
 		    file = s + 1;
@@ -763,7 +762,7 @@ gldppcmacos_read_file (filename, import)
 		}
 	      cs = *s;
 	      *s = '\0';
-	      while (isspace ((unsigned char) cs))
+	      while (ISSPACE (cs))
 		{
 		  ++s;
 		  cs = *s;
@@ -797,7 +796,7 @@ gldppcmacos_read_file (filename, import)
       syscall = false;
       address = (bfd_vma) -1;
 
-      while (! isspace ((unsigned char) *s) && *s != '\0')
+      while (! ISSPACE (*s) && *s != '\0')
 	++s;
       if (*s != '\0')
 	{
@@ -805,16 +804,16 @@ gldppcmacos_read_file (filename, import)
 
 	  *s++ = '\0';
 
-	  while (isspace ((unsigned char) *s))
+	  while (ISSPACE (*s))
 	    ++s;
 
 	  se = s;
-	  while (! isspace ((unsigned char) *se) && *se != '\0')
+	  while (! ISSPACE (*se) && *se != '\0')
 	    ++se;
 	  if (*se != '\0')
 	    {
 	      *se++ = '\0';
-	      while (isspace ((unsigned char) *se))
+	      while (ISSPACE (*se))
 		++se;
 	      if (*se != '\0')
 		einfo (_("%s%d: warning: syntax error in import/export file\n"),
diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index b943cbb..ae72eaa 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -23,9 +23,9 @@
 #include "sysdep.h"
 #include "bfdlink.h"
 #include "libiberty.h"
+#include "safe-ctype.h"
 
 #include <time.h>
-#include <ctype.h>
 
 #include "ld.h"
 #include "ldexp.h"
@@ -1254,7 +1254,7 @@ quoteput (s, f, needs_quotes)
     if (*cp == '\''
 	|| *cp == '"'
 	|| *cp == '\\'
-	|| isspace ((unsigned char) *cp)
+	|| ISSPACE (*cp)
 	|| *cp == ','
 	|| *cp == ';')
       needs_quotes = 1;
@@ -2088,7 +2088,7 @@ pe_dll_generate_implib (def, impfilename)
   dll_filename = (def->name) ? def->name : dll_name;
   dll_symname = xstrdup (dll_filename);
   for (i = 0; dll_symname[i]; i++)
-    if (!isalnum ((unsigned char) dll_symname[i]))
+    if (!ISALNUM (dll_symname[i]))
       dll_symname[i] = '_';
 
   unlink (impfilename);
@@ -2185,7 +2185,7 @@ pe_process_import_defs (output_bfd, link_info)
       dll_filename = module->name;
       dll_symname = xstrdup (module->name);
       for (i = 0; dll_symname[i]; i++)
-	if (!isalnum (dll_symname[i]))
+	if (!ISALNUM (dll_symname[i]))
 	  dll_symname[i] = '_';
 
       do_this_dll = 0;