This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to constify language_string & prototype init_parse/finish_parse
- To: egcs-patches@egcs.cygnus.com
- Subject: Patch to constify language_string & prototype init_parse/finish_parse
- From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
- Date: Sun, 29 Aug 1999 18:47:30 -0400 (EDT)
The following patch constifies `language_string'. It also
adds prototypes for init_parse() & finish_parse().
Okay to install?
Thanks,
--Kaveh
1999-08-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* c-parse.in (language_string): Constify.
* dwarf2out.c (language_string): Remove declaration.
* dwarfout.c (language_string): Likewise.
* toplev.c (language_string, init_parse, finish_parse): Likewise.
* tree.h (language_string, init_parse, finish_parse): Declare.
* i386/sun386.h (language_string): Remove declaration.
* mips.h (language_string): Likewise.
* nextstep.h (language_string): Likewise.
* nextstep21.h (language_string): Likewise.
* rs6000.c (language_string): Likewise.
diff -rup orig/egcs-CVS19990824/gcc/c-parse.in egcs-CVS19990824/gcc/c-parse.in
--- orig/egcs-CVS19990824/gcc/c-parse.in Wed Aug 4 16:44:32 1999
+++ egcs-CVS19990824/gcc/c-parse.in Wed Aug 25 10:16:48 1999
@@ -81,10 +81,10 @@ end ifobjc
/* Since parsers are distinct for each language, put the language string
definition here. */
ifobjc
-char *language_string = "GNU Obj-C";
+const char * const language_string = "GNU Obj-C";
end ifobjc
ifc
-char *language_string = "GNU C";
+const char * const language_string = "GNU C";
end ifc
/* Like YYERROR but do call yyerror. */
diff -rup orig/egcs-CVS19990824/gcc/dwarf2out.c egcs-CVS19990824/gcc/dwarf2out.c
--- orig/egcs-CVS19990824/gcc/dwarf2out.c Tue Aug 10 09:21:13 1999
+++ egcs-CVS19990824/gcc/dwarf2out.c Wed Aug 25 10:25:22 1999
@@ -2222,7 +2222,6 @@ limbo_die_node;
extern int flag_traditional;
extern char *version_string;
-extern char *language_string;
/* Fixed size portion of the DWARF compilation unit header. */
#define DWARF_COMPILE_UNIT_HEADER_SIZE (2 * DWARF_OFFSET_SIZE + 3)
diff -rup orig/egcs-CVS19990824/gcc/dwarfout.c egcs-CVS19990824/gcc/dwarfout.c
--- orig/egcs-CVS19990824/gcc/dwarfout.c Fri Aug 13 07:42:29 1999
+++ egcs-CVS19990824/gcc/dwarfout.c Wed Aug 25 10:29:30 1999
@@ -108,7 +108,6 @@ extern char *getpwd PROTO((void));
extern int flag_traditional;
extern char *version_string;
-extern char *language_string;
/* Maximum size (in bytes) of an artificially generated label. */
diff -rup orig/egcs-CVS19990824/gcc/toplev.c egcs-CVS19990824/gcc/toplev.c
--- orig/egcs-CVS19990824/gcc/toplev.c Wed Aug 25 10:46:39 1999
+++ egcs-CVS19990824/gcc/toplev.c Wed Aug 25 10:33:30 1999
@@ -140,7 +140,7 @@ You Lose! You must define PREFERRED_DEB
#if ! (defined (VMS) || defined (OS2))
extern char **environ;
#endif
-extern char *version_string, *language_string;
+extern char *version_string;
/* Carry information from ASM_DECLARE_OBJECT_NAME
to ASM_FINISH_DECLARE_OBJECT. */
@@ -148,8 +148,6 @@ extern char *version_string, *language_s
extern int size_directive_output;
extern tree last_assemble_variable_decl;
-extern char *init_parse PVPROTO((char *));
-extern void finish_parse ();
extern void init_decl_processing ();
extern void init_obstacks ();
extern void init_tree_codes ();
diff -rup orig/egcs-CVS19990824/gcc/tree.h egcs-CVS19990824/gcc/tree.h
--- orig/egcs-CVS19990824/gcc/tree.h Wed Aug 25 10:46:39 1999
+++ egcs-CVS19990824/gcc/tree.h Wed Aug 25 10:12:54 1999
@@ -1958,6 +1958,11 @@ extern const char *(*decl_printable_name
end of compilation. */
extern void (*incomplete_decl_finalize_hook) PROTO((tree));
+
+extern char *init_parse PROTO((char *));
+extern void finish_parse PROTO((void));
+
+extern const char * const language_string;
/* In tree.c */
extern char *perm_calloc PROTO((int, long));
diff -rup orig/egcs-CVS19990824/gcc/config/i386/sun386.h egcs-CVS19990824/gcc/config/i386/sun386.h
--- orig/egcs-CVS19990824/gcc/config/i386/sun386.h Wed Dec 16 16:04:16 1998
+++ egcs-CVS19990824/gcc/config/i386/sun386.h Wed Aug 25 10:38:28 1999
@@ -57,7 +57,7 @@ do \
#undef ASM_FILE_START
#define ASM_FILE_START(FILE) \
do { \
- extern char *version_string, *language_string; \
+ extern char *version_string; \
{ \
int len = strlen (main_input_filename); \
char *na = main_input_filename + len; \
diff -rup orig/egcs-CVS19990824/gcc/config/mips/mips.h egcs-CVS19990824/gcc/config/mips/mips.h
--- orig/egcs-CVS19990824/gcc/config/mips/mips.h Mon Aug 16 15:41:52 1999
+++ egcs-CVS19990824/gcc/config/mips/mips.h Wed Aug 25 10:38:44 1999
@@ -27,7 +27,6 @@ Boston, MA 02111-1307, USA. */
extern char *asm_file_name;
extern char call_used_regs[];
-extern char *language_string;
extern int may_call_alloca;
extern char **save_argv;
extern int target_flags;
diff -rup orig/egcs-CVS19990824/gcc/config/nextstep.h egcs-CVS19990824/gcc/config/nextstep.h
--- orig/egcs-CVS19990824/gcc/config/nextstep.h Wed Dec 16 16:00:00 1998
+++ egcs-CVS19990824/gcc/config/nextstep.h Wed Aug 25 10:37:59 1999
@@ -250,7 +250,6 @@ Boston, MA 02111-1307, USA. */
#undef ASM_FILE_END
#define ASM_FILE_END(FILE) \
do { \
- extern char *language_string; \
if (strcmp (language_string, "GNU C++") == 0) \
{ \
constructor_section (); \
diff -rup orig/egcs-CVS19990824/gcc/config/nextstep21.h egcs-CVS19990824/gcc/config/nextstep21.h
--- orig/egcs-CVS19990824/gcc/config/nextstep21.h Wed Dec 16 16:00:01 1998
+++ egcs-CVS19990824/gcc/config/nextstep21.h Wed Aug 25 10:38:12 1999
@@ -43,7 +43,6 @@ Boston, MA 02111-1307, USA. */
#undef ASM_FILE_END
#define ASM_FILE_END(FILE) \
do { \
- extern char *language_string; \
if (strcmp (language_string, "GNU C++") == 0) \
{ \
ASM_OUTPUT_ALIGN (FILE, 1); \
diff -rup orig/egcs-CVS19990824/gcc/config/rs6000/rs6000.c egcs-CVS19990824/gcc/config/rs6000/rs6000.c
--- orig/egcs-CVS19990824/gcc/config/rs6000/rs6000.c Thu Aug 19 15:42:03 1999
+++ egcs-CVS19990824/gcc/config/rs6000/rs6000.c Wed Aug 25 10:39:08 1999
@@ -43,7 +43,6 @@ Boston, MA 02111-1307, USA. */
#define TARGET_NO_PROTOTYPE 0
#endif
-extern char *language_string;
extern int profile_block_flag;
#define min(A,B) ((A) < (B) ? (A) : (B))
1999-08-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* parse.c (language_string): Constify.
diff -rup orig/egcs-CVS19990824/gcc/ch/parse.c egcs-CVS19990824/gcc/ch/parse.c
--- orig/egcs-CVS19990824/gcc/ch/parse.c Wed Aug 25 10:46:31 1999
+++ egcs-CVS19990824/gcc/ch/parse.c Wed Aug 25 10:34:14 1999
@@ -53,7 +53,7 @@ Boston, MA 02111-1307, USA. */
/* Since parsers are distinct for each language, put the
language string definition here. (fnf) */
-char *language_string = "GNU CHILL";
+const char * const language_string = "GNU CHILL";
/* Common code to be done before expanding any action. */
#define INIT_ACTION { \
1999-08-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* parse.y (language_string): Constify.
diff -rup orig/egcs-CVS19990824/gcc/cp/parse.y egcs-CVS19990824/gcc/cp/parse.y
--- orig/egcs-CVS19990824/gcc/cp/parse.y Mon Aug 16 15:42:13 1999
+++ egcs-CVS19990824/gcc/cp/parse.y Wed Aug 25 10:33:44 1999
@@ -45,7 +45,7 @@ Boston, MA 02111-1307, USA. */
/* Since parsers are distinct for each language, put the language string
definition here. (fnf) */
-char *language_string = "GNU C++";
+const char * const language_string = "GNU C++";
extern struct obstack permanent_obstack;
1999-08-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* com.c (language_string): Constify.
diff -rup orig/egcs-CVS19990824/gcc/f/com.c egcs-CVS19990824/gcc/f/com.c
--- orig/egcs-CVS19990824/gcc/f/com.c Wed Aug 25 10:46:40 1999
+++ egcs-CVS19990824/gcc/f/com.c Wed Aug 25 10:39:54 1999
@@ -234,7 +234,7 @@ tree va_list_type_node;
/* ~~gcc/tree.h *should* declare this, because toplev.c and dwarfout.c
reference it. */
-char *language_string = "GNU F77";
+const char * const language_string = "GNU F77";
/* Stream for reading from the input file. */
FILE *finput;
1999-08-25 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* lang.c (language_string): Constify.
diff -rup orig/egcs-CVS19990824/gcc/java/lang.c egcs-CVS19990824/gcc/java/lang.c
--- orig/egcs-CVS19990824/gcc/java/lang.c Wed Aug 25 10:46:40 1999
+++ egcs-CVS19990824/gcc/java/lang.c Wed Aug 25 10:34:05 1999
@@ -81,7 +81,7 @@ const char *java_tree_code_name[] = {
int compiling_from_source;
-char *language_string = "GNU Java";
+const char * const language_string = "GNU Java";
/* Nonzero if we want to automatically do array bounds checking;
on by default. Use -fno-bounds-check to disable. */