Makefile.in (TREE_H, [...]): Depend on version.h.

	* Makefile.in (TREE_H, collect2.o, gcc.h, mips-tfile.o, cccp.o,
	cpphash.o, cppinit.o, protoize.o, unprotoize.o): Depend on version.h.

	* cccp.c: Include version.h and/or don't declare `version_string'.
	* collect2.c: Likewise.
	* alpha.c: Likewise.
	* arm/aof.h: Likewise.
	* arm/coff.h: Likewise.
	* arm/elf.h: Likewise.
	* arm/pe.h: Likewise.
	* arm/tcoff.h: Likewise.
	* arm/telf.h: Likewise.
	* arm/tpe.h: Likewise.
	* arm/vxarm.h: Likewise.
	* convex/convex.c: Likewise.
	* i386/dgux.c: Likewise.
	* i386/sun386.h: Likewise.
	* m88k/m88k.c: Likewise.
	* mcore/mcore-pe.h: Likewise.
	* mips/mips.h: Likewise.
	* romp/romp.h: Likewise.
	* sh/sh.c: Likewise.
	* cpphash.c: Likewise.
	* cppinit.c: Likewise.
	* dwarf2out.c: Likewise.
	* dwarfout.c: Likewise.
	* gcc.c: Likewise.
	* gcc.h: Likewise.
	* mips-tfile.c: Likewise.
	* protoize.c: Likewise.
	* toplev.c: Likewise.
	* tree.h: Likewise.

	* version.c (version_string): Constify a char*.

	* version.h: New file.

ch:
	* grant.c: Don't declare `version_string'.

f:
	* g77spec.c: Don't declare `version_string'.

java:
	* Makefile.in (jv-scan, jcf-dump, gcjh): Depend on and link with
	version.o.
	(jcf-dump.o, gjavah.o, jv-scan.o): Depend on version.h.

	* gjavah.c: Include version.h.

	* jcf-dump.c: Likewise.

	* jv-scan.c: Likewise.

From-SVN: r31984

17 files changed, 1 insertions, 21 deletions

diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 36f831d..f3ff405 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -44,7 +44,6 @@ Boston, MA 02111-1307, USA.  */
 #include "tm_p.h"
 
 /* External data.  */
-extern char *version_string;
 extern int rtx_equal_function_value_matters;
 
 /* Specify which cpu to schedule for. */
diff --git a/gcc/config/arm/aof.h b/gcc/config/arm/aof.h
index 43518bc..9f67fc3 100644
--- a/gcc/config/arm/aof.h
+++ b/gcc/config/arm/aof.h
@@ -174,7 +174,6 @@ do {					\
 
 #define ASM_FILE_START(STREAM)					\
 {								\
-  extern char *version_string;					\
   fprintf ((STREAM), "%s Generated by gcc %s for ARM/%s\n", 	\
 	   ASM_COMMENT_START, version_string, ARM_OS_NAME);	\
   fprintf ((STREAM), "__r0\tRN\t0\n");				\
diff --git a/gcc/config/arm/coff.h b/gcc/config/arm/coff.h
index 4029eed..f98674b 100644
--- a/gcc/config/arm/coff.h
+++ b/gcc/config/arm/coff.h
@@ -67,7 +67,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_FILE_START(STREAM)					\
   do								\
     {								\
-      extern char * version_string;				\
       fprintf (STREAM, "%s Generated by gcc %s for ARM/coff\n",	\
 	       ASM_COMMENT_START, version_string);		\
       fprintf (STREAM, ASM_APP_OFF);				\
diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
index 3e06891..71b36d2 100644
--- a/gcc/config/arm/elf.h
+++ b/gcc/config/arm/elf.h
@@ -198,7 +198,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_FILE_START(STREAM)					\
   do								\
     {								\
-      extern char * version_string;				\
       fprintf (STREAM, "%s Generated by gcc %s for ARM/elf\n",	\
 	       ASM_COMMENT_START, version_string);		\
       output_file_directive (STREAM, main_input_filename);	\
diff --git a/gcc/config/arm/pe.h b/gcc/config/arm/pe.h
index 66dfc6b..41a3ceb 100644
--- a/gcc/config/arm/pe.h
+++ b/gcc/config/arm/pe.h
@@ -175,7 +175,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_FILE_START(STREAM)					\
   do								\
     {								\
-      extern char * version_string;				\
       asm_fprintf (STREAM, "%@ Generated by gcc %s for ARM/pe\n",\
 	   version_string);					\
       output_file_directive ((STREAM), main_input_filename);	\
diff --git a/gcc/config/arm/tcoff.h b/gcc/config/arm/tcoff.h
index 5f14c1e..3787002 100644
--- a/gcc/config/arm/tcoff.h
+++ b/gcc/config/arm/tcoff.h
@@ -60,7 +60,6 @@ extern int arm_structure_size_boundary;
 #undef ASM_FILE_START
 #define ASM_FILE_START(STREAM) \
 do {								\
-  extern char *version_string;					\
   fprintf ((STREAM), "%s Generated by gcc %s for Thumb/coff\n", \
 	   ASM_COMMENT_START, version_string);	                \
   fprintf ((STREAM), ASM_APP_OFF);                              \
diff --git a/gcc/config/arm/telf.h b/gcc/config/arm/telf.h
index fbf5212..bb199ac 100644
--- a/gcc/config/arm/telf.h
+++ b/gcc/config/arm/telf.h
@@ -67,7 +67,6 @@ extern int arm_structure_size_boundary;
 #define ASM_FILE_START(STREAM)						\
   do									\
     {									\
-      extern char * version_string;					\
       fprintf ((STREAM), "%s Generated by gcc %s for Thumb/elf\n",	\
 	       ASM_COMMENT_START, version_string);			\
       fprintf ((STREAM), ASM_APP_OFF);					\
diff --git a/gcc/config/arm/tpe.h b/gcc/config/arm/tpe.h
index 526cd36..c7f0683d 100644
--- a/gcc/config/arm/tpe.h
+++ b/gcc/config/arm/tpe.h
@@ -91,7 +91,6 @@ extern int arm_structure_size_boundary;
 #undef  ASM_FILE_START
 #define ASM_FILE_START(STREAM) \
 do {								\
-  extern char * version_string;					\
   fprintf ((STREAM), "%s Generated by gcc %s for Thumb/coff\n", \
 	   ASM_COMMENT_START, version_string);	                \
   fprintf ((STREAM), ASM_APP_OFF);                              \
@@ -301,7 +300,6 @@ do {								\
 #undef  ASM_FILE_START
 #define ASM_FILE_START(STREAM) \
 do {								\
-  extern char * version_string;					\
   fprintf (STREAM, "%s Generated by gcc %s for ARM/pe\n",	\
 	   ASM_COMMENT_START, version_string);			\
   output_file_directive ((STREAM), main_input_filename);	\
diff --git a/gcc/config/arm/vxarm.h b/gcc/config/arm/vxarm.h
index b42bbbe..53381b93 100644
--- a/gcc/config/arm/vxarm.h
+++ b/gcc/config/arm/vxarm.h
@@ -67,7 +67,6 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_FILE_START(STREAM) 					\
 do 								\
 {								\
-  extern char * version_string;					\
   fprintf (STREAM, "%s Generated by gcc %s for ARM/VxWorks\n",	\
 	   ASM_COMMENT_START, version_string);			\
 } while (0)
diff --git a/gcc/config/convex/convex.c b/gcc/config/convex/convex.c
index 69e1339..6230478 100644
--- a/gcc/config/convex/convex.c
+++ b/gcc/config/convex/convex.c
@@ -472,7 +472,6 @@ asm_declare_function_name (file, name, decl)
 
   const char *p;
   char c;
-  extern char *version_string;
   static char vers[4];
   int i;
   
diff --git a/gcc/config/i386/dgux.c b/gcc/config/i386/dgux.c
index 55ff824..915719d 100644
--- a/gcc/config/i386/dgux.c
+++ b/gcc/config/i386/dgux.c
@@ -22,9 +22,6 @@ Boston, MA 02111-1307, USA.  */
 #include <time.h>
 #include "i386/i386.c"
 
-
-extern char *version_string;
-
 struct lang_independent_option
 {
   char *string;
diff --git a/gcc/config/i386/sun386.h b/gcc/config/i386/sun386.h
index 8171b89..c7bd415 100644
--- a/gcc/config/i386/sun386.h
+++ b/gcc/config/i386/sun386.h
@@ -57,7 +57,6 @@ do								\
 #undef ASM_FILE_START
 #define ASM_FILE_START(FILE) \
   do {							\
-    extern char *version_string;			\
     {							\
       int len = strlen (main_input_filename);		\
       char *na = main_input_filename + len;		\
diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c
index 4e3ce2c..6c00fac 100644
--- a/gcc/config/m88k/m88k.c
+++ b/gcc/config/m88k/m88k.c
@@ -41,7 +41,6 @@ Boston, MA 02111-1307, USA.  */
 #include "toplev.h"
 #include "tm_p.h"
 
-extern char *version_string;
 extern int flag_traditional;
 extern FILE *asm_out_file;
 
diff --git a/gcc/config/mcore/mcore-pe.h b/gcc/config/mcore/mcore-pe.h
index 89d4e61..8098c85 100644
--- a/gcc/config/mcore/mcore-pe.h
+++ b/gcc/config/mcore/mcore-pe.h
@@ -154,7 +154,6 @@ rdata_section ()						\
 #define ASM_FILE_START(STREAM)					\
   do								\
     {								\
-      extern char * version_string;				\
       fprintf (STREAM, "%s Generated by gcc %s for MCore/pe\n",	\
 	   ASM_COMMENT_START, version_string);			\
       output_file_directive ((STREAM), main_input_filename);	\
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index bc975ef..437cf06 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -30,7 +30,6 @@ extern char	call_used_regs[];
 extern int	may_call_alloca;
 extern char   **save_argv;
 extern int	target_flags;
-extern char    *version_string;
 
 /* MIPS external variables defined in mips.c.  */
 
diff --git a/gcc/config/romp/romp.h b/gcc/config/romp/romp.h
index 25a6474..cc2914d 100644
--- a/gcc/config/romp/romp.h
+++ b/gcc/config/romp/romp.h
@@ -1360,8 +1360,7 @@ struct rt_cargs {int gregs, fregs; };
 /* Output at beginning of assembler file.  */
 
 #define ASM_FILE_START(FILE)				\
-{ extern char *version_string;				\
-  const char *p;					\
+{ const char *p;					\
 							\
   fprintf (FILE, "\t.globl .oVncs\n\t.set .oVncs,0\n") ; \
   fprintf (FILE, "\t.globl .oVgcc");			\
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 3f1f8b1..d039650 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -74,7 +74,6 @@ int current_function_anonymous_args;
 
 /* Global variables from toplev.c and final.c that are used within, but
    not declared in any header file.  */
-extern char *version_string;
 extern int *insn_addresses;
 
 /* Global variables for machine-dependent things. */