From: nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 5 Jul 2003 16:11:53 +0000 (+0000)
Subject: 	* toplev.c (output_clean_symbol_name): Remove.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8789d51c3a1eb0c83165f7e2b1698343f8d6adaf;p=thirdparty%2Fgcc.git

	* toplev.c (output_clean_symbol_name): Remove.
	* toplev.h (output_clean_symbol_name): Remove.
	* config/alpha/alpha.c (unicosmk_output_module_name): Use
	lbasename & clean_symbol_name.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@68978 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8630de6daee..33ea3abd478a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-05  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* toplev.c (output_clean_symbol_name): Remove.
+	* toplev.h (output_clean_symbol_name): Remove.
+	* config/alpha/alpha.c (unicosmk_output_module_name): Use
+	lbasename & clean_symbol_name.
+
 2003-07-05  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* ggc.h: Follow spelling conventions.
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 927073f1c4a7..df386deb9375 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -9278,22 +9278,19 @@ unicosmk_initial_elimination_offset (int from, int to)
 static void
 unicosmk_output_module_name (FILE *file)
 {
-  const char *name;
-
-  /* Strip directories.  */
-
-  name = strrchr (main_input_filename, '/');
-  if (name)
-    ++name;
-  else
-    name = main_input_filename;
-
+  const char *name = lbasename (main_input_filename);
+  unsigned len = strlen (name);
+  char *clean_name = alloca (len + 2);
+  char *ptr = clean_name;
+  
   /* CAM only accepts module names that start with a letter or '$'. We
      prefix the module name with a '$' if necessary.  */
 
   if (!ISALPHA (*name))
-    putc ('$', file);
-  output_clean_symbol_name (file, name);
+    *ptr++ = '$';
+  memcpy (ptr, name, len + 1);
+  clean_symbol_name (clean_name);
+  fputs (clean_name, file);
 }
 
 /* Output the definition of a common variable.  */
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 2f83d681e467..33374679f64e 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1699,22 +1699,6 @@ output_quoted_string (FILE *asm_file, const char *string)
 #endif
 }
 
-/* Output NAME into FILE after having turned it into something
-   usable as an identifier in a target's assembly file.  */
-void
-output_clean_symbol_name (FILE *file, const char *name)
-{
-  /* Make a copy of NAME.  */
-  char *id = xstrdup (name);
-
-  /* Make it look like a valid identifier for an assembler.  */
-  clean_symbol_name (id);
-
-  fputs (id, file);
-  free (id);
-}
-
-
 /* Output a file name in the form wanted by System V.  */
 
 void
diff --git a/gcc/toplev.h b/gcc/toplev.h
index 0be768f18bad..e750207b9236 100644
--- a/gcc/toplev.h
+++ b/gcc/toplev.h
@@ -89,7 +89,6 @@ extern void warning_for_asm		(struct rtx_def *,
 					 const char *, ...) ATTRIBUTE_GCC_DIAG(2,3);
 extern void warn_deprecated_use		(union tree_node *);
 
-extern void output_clean_symbol_name    (FILE *, const char *);
 #ifdef BUFSIZ
 extern void output_quoted_string	(FILE *, const char *);
 extern void output_file_directive	(FILE *, const char *);