gcc-4.0.2-vs.patch.svn-base

PSP开发环境(Linux) 包含PSPLINK 请自行选择需要安装的库及源代码

diff -burN gcc-4.0.2-orig/boehm-gc/include/private/gc_priv.h gcc-4.0.2-patch/boehm-gc/include/private/gc_priv.h
--- gcc-4.0.2-orig/boehm-gc/include/private/gc_priv.h	2005-02-16 15:10:42.000000000 +1100
+++ gcc-4.0.2-patch/boehm-gc/include/private/gc_priv.h	2006-11-25 15:13:08.521031200 +1100
@@ -1888,7 +1888,7 @@
 
 # ifdef GC_ASSERTIONS
 #	define GC_ASSERT(expr) if(!(expr)) {\
-		GC_err_printf2("Assertion failure: %s:%ld\n", \
+		GC_err_printf2("Assertion failure: %s(%ld)\n", \
 				__FILE__, (unsigned long)__LINE__); \
 		ABORT("assertion failure"); }
 # else 
diff -burN gcc-4.0.2-orig/fastjar/compress.c gcc-4.0.2-patch/fastjar/compress.c
--- gcc-4.0.2-orig/fastjar/compress.c	2004-07-07 07:40:08.000000000 +1000
+++ gcc-4.0.2-patch/fastjar/compress.c	2006-11-24 19:15:38.249828800 +1100
@@ -210,7 +210,7 @@
     
     /* deflate the data */
     if(deflate(&zs, 0) != Z_OK){
-      fprintf(stderr, "Error deflating! %s:%d\n", __FILE__, __LINE__);
+      fprintf(stderr, "Error deflating! %s(%d) \n", __FILE__, __LINE__);
       exit(1);
     }
     
diff -burN gcc-4.0.2-orig/fastjar/jargrep.c gcc-4.0.2-patch/fastjar/jargrep.c
--- gcc-4.0.2-orig/fastjar/jargrep.c	2003-01-29 09:25:47.000000000 +1100
+++ gcc-4.0.2-patch/fastjar/jargrep.c	2006-11-24 19:15:38.630376000 +1100
@@ -449,7 +449,7 @@
 		o_begin = begin;
 		free(str);
 	}
-	if(options & JG_PRINT_COUNT) printf("%s:%d\n", filename, ln_cnt);
+	if(options & JG_PRINT_COUNT) printf("%s(%d) \n", filename, ln_cnt);
 }
 
 /*
diff -burN gcc-4.0.2-orig/gcc/c-aux-info.c gcc-4.0.2-patch/gcc/c-aux-info.c
--- gcc-4.0.2-orig/gcc/c-aux-info.c	2004-10-04 06:52:59.000000000 +1000
+++ gcc-4.0.2-patch/gcc/c-aux-info.c	2006-11-24 19:15:40.493054400 +1100
@@ -569,7 +569,7 @@
 
       /* Write the actual line of auxiliary info.  */
 
-      fprintf (aux_info_file, "/* %s:%d:%c%c */ %s;",
+      fprintf (aux_info_file, "/* %s(%d) :%c%c */ %s;",
 	       xloc.file, xloc.line,
 	       (is_implicit) ? 'I' : (is_prototyped) ? 'N' : 'O',
 	       (is_definition) ? 'F' : 'C',
diff -burN gcc-4.0.2-orig/gcc/collect2.c gcc-4.0.2-patch/gcc/collect2.c
--- gcc-4.0.2-orig/gcc/collect2.c	2005-06-07 05:20:26.000000000 +1000
+++ gcc-4.0.2-patch/gcc/collect2.c	2006-11-24 19:15:41.284192000 +1100
@@ -399,7 +399,7 @@
 void
 fancy_abort (const char *file, int line, const char *func)
 {
-  fatal ("internal gcc abort in %s, at %s:%d", func, file, line);
+  fatal ("internal gcc abort in %s, at %s(%d) ", func, file, line);
 }
 
 static void
diff -burN gcc-4.0.2-orig/gcc/config/i386/host-mingw32.c gcc-4.0.2-patch/gcc/config/i386/host-mingw32.c
--- gcc-4.0.2-orig/gcc/config/i386/host-mingw32.c	2004-06-05 17:28:27.000000000 +1000
+++ gcc-4.0.2-patch/gcc/config/i386/host-mingw32.c	2006-11-24 19:16:13.630704000 +1100
@@ -62,7 +62,7 @@
     		  NULL, GetLastError(),
 		  MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
 		  (LPSTR) &w32_msgbuf, 0, NULL);
-  fprintf(stderr, "internal error in %s, at %s:%d: %s: %s\n",
+  fprintf(stderr, "internal error in %s, at %s(%d) : %s: %s\n",
 	  function, trim_filename (file), line, my_msg, w32_msgbuf);
   LocalFree ((HLOCAL)w32_msgbuf);
 }
diff -burN gcc-4.0.2-orig/gcc/config/sh/symbian.c gcc-4.0.2-patch/gcc/config/sh/symbian.c
--- gcc-4.0.2-orig/gcc/config/sh/symbian.c	2004-11-09 21:13:25.000000000 +1100
+++ gcc-4.0.2-patch/gcc/config/sh/symbian.c	2006-11-24 19:16:15.553468800 +1100
@@ -889,7 +889,7 @@
 void
 lang_check_failed (const char *file, int line, const char *function)
 {
-  internal_error ("lang_* check: failed in %s, at %s:%d",
+  internal_error ("lang_* check: failed in %s, at %s(%d) ",
 		  function, trim_filename (file), line);
 }
 #endif /* ENABLE_TREE_CHECKING */
diff -burN gcc-4.0.2-orig/gcc/cp/error.c gcc-4.0.2-patch/gcc/cp/error.c
--- gcc-4.0.2-orig/gcc/cp/error.c	2005-09-10 07:05:51.000000000 +1000
+++ gcc-4.0.2-patch/gcc/cp/error.c	2006-11-24 19:16:16.154332800 +1100
@@ -2228,13 +2228,13 @@
       xloc = expand_location (loc);
       if (t == NULL_TREE)
 	break;
-      pp_verbatim (context->printer, "%s:%d:   instantiated from %qs\n",
+      pp_verbatim (context->printer, "%s(%d) :   instantiated from %qs\n",
                    xloc.file, xloc.line,
                    decl_as_string (TINST_DECL (t),
                                    TFF_DECL_SPECIFIERS | TFF_RETURN_TYPE));
       loc = TINST_LOCATION (t);
     }
-  pp_verbatim (context->printer, "%s:%d:   instantiated from here\n",
+  pp_verbatim (context->printer, "%s(%d) :   instantiated from here\n",
                xloc.file, xloc.line);
 }
 
diff -burN gcc-4.0.2-orig/gcc/cp/tree.c gcc-4.0.2-patch/gcc/cp/tree.c
--- gcc-4.0.2-orig/gcc/cp/tree.c	2005-09-07 01:01:01.000000000 +1000
+++ gcc-4.0.2-patch/gcc/cp/tree.c	2006-11-24 19:16:16.254476800 +1100
@@ -2294,7 +2294,7 @@
 void
 lang_check_failed (const char* file, int line, const char* function)
 {
-  internal_error ("lang_* check: failed in %s, at %s:%d",
+  internal_error ("lang_* check: failed in %s, at %s(%d) ",
 		  function, trim_filename (file), line);
 }
 #endif /* ENABLE_TREE_CHECKING */
diff -burN gcc-4.0.2-orig/gcc/diagnostic.c gcc-4.0.2-patch/gcc/diagnostic.c
--- gcc-4.0.2-orig/gcc/diagnostic.c	2005-06-07 05:20:26.000000000 +1000
+++ gcc-4.0.2-patch/gcc/diagnostic.c	2006-11-24 19:15:42.566035200 +1100
@@ -137,7 +137,7 @@
   gcc_assert (diagnostic->kind < DK_LAST_DIAGNOSTIC_KIND);
 
   return s.file
-    ? build_message_string ("%s:%d: %s",
+    ? build_message_string ("%s(%d) : %s",
                             s.file, s.line,
                             _(diagnostic_kind_text[diagnostic->kind]))
     : build_message_string ("%s: %s", progname,
@@ -165,7 +165,7 @@
 	  && !context->abort_on_error)
 	{
 	  expanded_location s = expand_location (diagnostic->location);
-	  fnotice (stderr, "%s:%d: confused by earlier errors, bailing out\n",
+	  fnotice (stderr, "%s(%d) : confused by earlier errors, bailing out\n",
 		   s.file, s.line);
 	  exit (FATAL_EXIT_CODE);
 	}
@@ -276,13 +276,13 @@
     {
       expanded_location xloc = expand_location (p->location);
       pp_verbatim (context->printer,
-                   "In file included from %s:%d",
+                   "In file included from %s(%d) ",
 		   xloc.file, xloc.line);
       while ((p = p->next) != NULL)
 	{
 	  xloc = expand_location (p->location);
 	  pp_verbatim (context->printer,
-		       ",\n                 from %s:%d",
+		       ",\n                 from %s(%d) ",
 		       xloc.file, xloc.line);
 	}
       pp_verbatim (context->printer, ":\n");
@@ -553,7 +553,7 @@
 void
 fancy_abort (const char *file, int line, const char *function)
 {
-  internal_error ("in %s, at %s:%d", function, trim_filename (file), line);
+  internal_error ("in %s, at %s(%d) ", function, trim_filename (file), line);
 }
 
 /* Really call the system 'abort'.  This has to go right at the end of
diff -burN gcc-4.0.2-orig/gcc/doc/cpp.info gcc-4.0.2-patch/gcc/doc/cpp.info
--- gcc-4.0.2-orig/gcc/doc/cpp.info	2005-09-28 16:21:58.000000000 +1000
+++ gcc-4.0.2-patch/gcc/doc/cpp.info	2006-11-24 19:16:16.444750400 +1100
@@ -1480,8 +1480,8 @@
 This sequence of tokens replaces the identifier `__VA_ARGS__' in the
 macro body wherever it appears.  Thus, we have this expansion:
 
-     eprintf ("%s:%d: ", input_file, lineno)
-          ==>  fprintf (stderr, "%s:%d: ", input_file, lineno)
+     eprintf ("%s(%d) : ", input_file, lineno)
+          ==>  fprintf (stderr, "%s(%d) : ", input_file, lineno)
 
    The variable argument is completely macro-expanded before it is
 inserted into the macro expansion, just like an ordinary argument.  You
diff -burN gcc-4.0.2-orig/gcc/doc/cpp.texi gcc-4.0.2-patch/gcc/doc/cpp.texi
--- gcc-4.0.2-orig/gcc/doc/cpp.texi	2005-04-15 03:17:29.000000000 +1000
+++ gcc-4.0.2-patch/gcc/doc/cpp.texi	2006-11-24 19:16:16.454764800 +1100
@@ -1647,8 +1647,8 @@
 have this expansion:
 
 @smallexample
-eprintf ("%s:%d: ", input_file, lineno)
-     @expansion{}  fprintf (stderr, "%s:%d: ", input_file, lineno)
+eprintf ("%s(%d) : ", input_file, lineno)
+     @expansion{}  fprintf (stderr, "%s(%d) : ", input_file, lineno)
 @end smallexample
 
 The variable argument is completely macro-expanded before it is inserted
diff -burN gcc-4.0.2-orig/gcc/dwarf2out.c gcc-4.0.2-patch/gcc/dwarf2out.c
--- gcc-4.0.2-orig/gcc/dwarf2out.c	2005-09-02 00:04:38.000000000 +1000
+++ gcc-4.0.2-patch/gcc/dwarf2out.c	2006-11-24 19:15:42.986640000 +1100
@@ -13244,7 +13244,7 @@
 
       /* If requested, emit something human-readable.  */
       if (flag_debug_asm)
-	fprintf (asm_out_file, "\t%s %s:%d\n", ASM_COMMENT_START,
+	fprintf (asm_out_file, "\t%s %s(%d) \n", ASM_COMMENT_START,
 		 filename, line);
 
       if (DWARF2_ASM_LINE_DEBUG_INFO)
diff -burN gcc-4.0.2-orig/gcc/errors.c gcc-4.0.2-patch/gcc/errors.c
--- gcc-4.0.2-orig/gcc/errors.c	2004-08-23 21:56:53.000000000 +1000
+++ gcc-4.0.2-patch/gcc/errors.c	2006-11-24 19:15:43.156884800 +1100
@@ -130,5 +130,5 @@
 void
 fancy_abort (const char *file, int line, const char *func)
 {
-  internal_error ("abort in %s, at %s:%d", func, trim_filename (file), line);
+  internal_error ("abort in %s, at %s(%d) ", func, trim_filename (file), line);
 }
diff -burN gcc-4.0.2-orig/gcc/fortran/error.c gcc-4.0.2-patch/gcc/fortran/error.c
--- gcc-4.0.2-orig/gcc/fortran/error.c	2005-07-14 20:19:28.000000000 +1000
+++ gcc-4.0.2-patch/gcc/fortran/error.c	2006-11-24 19:16:16.895398400 +1100
@@ -134,7 +134,7 @@
 
   lb = loc->lb;
   f = lb->file;
-  error_printf ("In file %s:%d\n", f->filename,
+  error_printf ("In file %s(%d) \n", f->filename,
 #ifdef USE_MAPPED_LOCATION
 		LOCATION_LINE (lb->location)
 #else
@@ -149,7 +149,7 @@
       f = f->included_by;
       if (f == NULL) break;
 
-      error_printf ("    Included at %s:%d\n", f->filename, i);
+      error_printf ("    Included at %s(%d) \n", f->filename, i);
     }
 
   /* Show the line itself, taking care not to print more than what can
diff -burN gcc-4.0.2-orig/gcc/fortran/scanner.c gcc-4.0.2-patch/gcc/fortran/scanner.c
--- gcc-4.0.2-orig/gcc/fortran/scanner.c	2005-08-20 01:50:43.000000000 +1000
+++ gcc-4.0.2-patch/gcc/fortran/scanner.c	2006-11-24 19:16:17.025585600 +1100
@@ -909,7 +909,7 @@
       if (!current_file->up
 	  || strcmp (current_file->up->filename, filename) != 0)
 	{
-	  gfc_warning_now ("%s:%d: file %s left but not entered",
+	  gfc_warning_now ("%s(%d) : file %s left but not entered",
 			   current_file->filename, current_file->line,
 			   filename);
 	  return;
@@ -932,7 +932,7 @@
   return;
 
  bad_cpp_line:
-  gfc_warning_now ("%s:%d: Illegal preprocessor directive",
+  gfc_warning_now ("%s(%d) : Illegal preprocessor directive",
 		   current_file->filename, current_file->line);
   current_file->line++;
 }
diff -burN gcc-4.0.2-orig/gcc/gcc.c gcc-4.0.2-patch/gcc/gcc.c
--- gcc-4.0.2-orig/gcc/gcc.c	2005-06-07 05:20:29.000000000 +1000
+++ gcc-4.0.2-patch/gcc/gcc.c	2006-11-24 19:15:44.979505600 +1100
@@ -6733,7 +6733,7 @@
 void
 fancy_abort (const char *file, int line, const char *func)
 {
-  fatal ("internal gcc abort in %s, at %s:%d", func, file, line);
+  fatal ("internal gcc abort in %s, at %s(%d) ", func, file, line);
 }
 
 /* Output an error message and exit.  */
diff -burN gcc-4.0.2-orig/gcc/genemit.c gcc-4.0.2-patch/gcc/genemit.c
--- gcc-4.0.2-orig/gcc/genemit.c	2004-09-09 23:22:33.000000000 +1000
+++ gcc-4.0.2-patch/gcc/genemit.c	2006-11-24 19:15:45.550326400 +1100
@@ -398,7 +398,7 @@
   if (XSTR (insn, 0)[0] == 0 || XSTR (insn, 0)[0] == '*')
     return;
 
-  printf ("/* %s:%d */\n", read_rtx_filename, lineno);
+  printf ("/* %s(%d)  */\n", read_rtx_filename, lineno);
 
   /* Find out how many operands this function has.  */
   operands = max_operand_vec (insn, 1);
@@ -861,17 +861,17 @@
 	  break;
 
 	case DEFINE_EXPAND:
-	  printf ("/* %s:%d */\n", read_rtx_filename, line_no);
+	  printf ("/* %s(%d)  */\n", read_rtx_filename, line_no);
 	  gen_expand (desc);
 	  break;
 
 	case DEFINE_SPLIT:
-	  printf ("/* %s:%d */\n", read_rtx_filename, line_no);
+	  printf ("/* %s(%d)  */\n", read_rtx_filename, line_no);
 	  gen_split (desc);
 	  break;