* errors.c: Don't include coretypes.h or tm.h.

	(trim_filename): Use IS_DIR_SEPARATOR.
	* Makefile.in: Update dependencies of errors.o and
	$(BUILD_PREFIX_1)errors.o.


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

3 files changed, 25 insertions, 24 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54c7374e87d..b858dc69d84 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-07  Zack Weinberg  <zack@codesourcery.com>
+
+	* errors.c: Don't include coretypes.h or tm.h.
+	(trim_filename): Use IS_DIR_SEPARATOR.
+	* Makefile.in: Update dependencies of errors.o and
+	$(BUILD_PREFIX_1)errors.o.
+
 2003-10-07  Geoffrey Keating  <geoffk@apple.com>
 
 	* function.c (pad_to_arg_alignment): Take STACK_POINTER_OFFSET into
@@ -76,25 +83,25 @@
 
 2003-10-07  Dorit Naishlos <dorit@il.ibm.com>
 
-	* sched-int.h (sched_info): New field 
+	* sched-int.h (sched_info): New field
 	sched_max_insns_priority.
 	* sched-rgn.c (init_ready_list): Add invocations to
-        targetm.sched.adjust_priority.  
+	targetm.sched.adjust_priority.
 	(sched_max_insns_priority): Init new field.
 	* sched-ebb.c (sched_max_insns_priority): Init new field.
-        * haifa-sched.c (set_priorities): Set
-	sched_info->sched_max_insns_priority. 
-        * config/rs6000/rs6000.h:
-        (rs6000_sched_restricted_insns_priority_str): Support new
-        flag -mprioritize-restricted-insns.
-        (DEFAULT_RESTRICTED_INSNS_PRIORITY): Define.
-        * config/rs6000/rs6000.c (is_dispatch_slot_restricted): New
-        function.
-        (rs6000_adjust_priority): Change priority of restricted
-        insns, using above new function and new flag.
-        * doc/invoke.texi (-mprioritize-restricted-insns): Document
-        new option.
-	
+	* haifa-sched.c (set_priorities): Set
+	sched_info->sched_max_insns_priority.
+	* config/rs6000/rs6000.h:
+	(rs6000_sched_restricted_insns_priority_str): Support new
+	flag -mprioritize-restricted-insns.
+	(DEFAULT_RESTRICTED_INSNS_PRIORITY): Define.
+	* config/rs6000/rs6000.c (is_dispatch_slot_restricted): New
+	function.
+	(rs6000_adjust_priority): Change priority of restricted
+	insns, using above new function and new flag.
+	* doc/invoke.texi (-mprioritize-restricted-insns): Document
+	new option.
+
 2003-10-07  Zack Weinberg  <zack@codesourcery.com>
 
 	* expr.c (cmpstr_optab, cmpmem_optab): New.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 0fd10b884da..e891ca5b896 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1522,7 +1522,7 @@ print-rtl.o : print-rtl.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(RTL_H) $
 rtlanal.o : rtlanal.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) toplev.h $(RTL_H) \
    hard-reg-set.h $(TM_P_H) insn-config.h $(RECOG_H) real.h flags.h
 
-errors.o : errors.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(GTM_H) errors.h
+errors.o : errors.c $(CONFIG_H) $(SYSTEM_H) errors.h
 	$(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
 
 varasm.o : varasm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(TREE_H) $(RTL_H) \
@@ -2255,7 +2255,7 @@ $(BUILD_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(BCONFIG_H) coretypes.h $(GTM_H)
 	sed -e 's/config[.]h/bconfig.h/' $(srcdir)/bitmap.c > $(BUILD_PREFIX)bitmap.c
 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)bitmap.c $(OUTPUT_OPTION)
 
-$(BUILD_PREFIX_1)errors.o: errors.c $(BCONFIG_H) coretypes.h $(GTM_H) $(SYSTEM_H) errors.h
+$(BUILD_PREFIX_1)errors.o: errors.c $(BCONFIG_H) $(SYSTEM_H) errors.h
 	rm -f $(BUILD_PREFIX)errors.c
 	sed -e 's/config[.]h/bconfig.h/' $(srcdir)/errors.c > $(BUILD_PREFIX)errors.c
 	$(CC_FOR_BUILD) -c $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) $(INCLUDES) $(BUILD_PREFIX)errors.c $(OUTPUT_OPTION)
diff --git a/gcc/errors.c b/gcc/errors.c
index 6cbc29c47e3..09504d39d86 100644
--- a/gcc/errors.c
+++ b/gcc/errors.c
@@ -25,8 +25,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "config.h"
 #include "system.h"
-#include "coretypes.h"
-#include "tm.h"
 #include "errors.h"
 
 /* Set this to argv[0] at the beginning of main.  */
@@ -116,11 +114,7 @@ trim_filename (const char *name)
     p++, q++;
 
   /* Now go backwards until the previous directory separator.  */
-  while (p > name && p[-1] != DIR_SEPARATOR
-#ifdef DIR_SEPARATOR_2
-	 && p[-1] != DIR_SEPARATOR_2
-#endif
-	 )
+  while (p > name && !IS_DIR_SEPARATOR (p[-1]))
     p--;
 
   return p;