diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4974136b1e..aab2dc006a1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-29  Aaron W. LaFramboise  <aaronavay62@aaronwl.com>
+
+	* read-rtl.c (apply_macro_to_string): Replace index with strchr.
+
 2004-09-29  Jakub Jelinek  <jakub@redhat.com>
 
 	* tree.h (enum tree_index): Add TI_VA_LIST_GPR_COUNTER_FIELD
diff --git a/gcc/read-rtl.c b/gcc/read-rtl.c
index 2cd4e22a4c1..c9a3fee81dd 100644
--- a/gcc/read-rtl.c
+++ b/gcc/read-rtl.c
@@ -245,13 +245,13 @@ apply_macro_to_string (const char *string, struct mapping *macro, int value)
     return string;
 
   base = p = copy = ASTRDUP (string);
-  while ((start = index (p, '<')) && (end = index (start, '>')))
+  while ((start = strchr (p, '<')) && (end = strchr (start, '>')))
     {
       p = start + 1;
 
       /* If there's a "macro:" prefix, check whether the macro name matches.
 	 Set ATTR to the start of the attribute name.  */
-      attr = index (p, ':');
+      attr = strchr (p, ':');
       if (attr == 0 || attr > end)
 	attr = p;
       else