xcoffout.c (xcoff_current_include_file, [...]): Constify char *.

        * xcoffout.c (xcoff_current_include_file,
        xcoff_current_function_file, xcoff_lastfile): Constify char *.
        (xcoffout_source_file, xcoffout_source_line): Make filename 'const
        char *'.
        (xcoffout_declare_function): Make name 'const char *'.
        (xcoffout_end_epilogue): Make fname 'const char *'
        * xcoffout.h (xcoff_current_include_file, xcoff_lastfile,
        xcoffout_declare_function, xcoffout_source_line): Match above.

        * aix43.h (SUBTARGET_OVERRIDE_OPTIONS): -mpowerpc64 without
        -maix64 is error.
        * rs6000.c (print_operand): Fix lossage typo.
        (output_cbranch): Remove "cr" decoration for now.
        * rs6000.h (ASM_OUTPUT_DEF_FROM_DECLS): Make alias 'const char *'.

From-SVN: r33720

6 files changed, 38 insertions, 17 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3e7dda2..1c68b3e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2000-05-06  David Edelsohn  <edelsohn@gnu.org>
+
+	* xcoffout.c (xcoff_current_include_file,
+	xcoff_current_function_file, xcoff_lastfile): Constify char *.
+	(xcoffout_source_file, xcoffout_source_line): Make filename 'const
+	char *'.
+	(xcoffout_declare_function): Make name 'const char *'.
+	(xcoffout_end_epilogue): Make fname 'const char *'
+	* xcoffout.h (xcoff_current_include_file, xcoff_lastfile,
+	xcoffout_declare_function, xcoffout_source_line): Match above.
+
+	* aix43.h (SUBTARGET_OVERRIDE_OPTIONS): -mpowerpc64 without
+	-maix64	is error.
+	* rs6000.c (print_operand): Fix lossage typo.
+	(output_cbranch): Remove "cr" decoration for now.
+	* rs6000.h (ASM_OUTPUT_DEF_FROM_DECLS): Make alias 'const char *'. 
+
 Sat May  6 06:55:32 2000  Denis Chertykov  <denisc@overta.ru>
 
 	* config/avr/avr.c (out_shift_with_cnt): Bugfix for shift by
diff --git a/gcc/config/rs6000/aix43.h b/gcc/config/rs6000/aix43.h
index d700a44..c6a8d8d 100644
--- a/gcc/config/rs6000/aix43.h
+++ b/gcc/config/rs6000/aix43.h
@@ -53,11 +53,15 @@ do {									\
       target_flags &= ~NON_POWERPC_MASKS;				\
       warning ("-maix64 and POWER architecture are incompatible.");	\
     }									\
-  if (TARGET_64BIT && ! (target_flags & MASK_POWERPC64))		\
+  if (TARGET_64BIT && ! TARGET_POWERPC64)				\
     {									\
       target_flags |= MASK_POWERPC64;					\
       warning ("-maix64 requires PowerPC64 architecture remain enabled."); \
     }									\
+  if (TARGET_POWERPC64 && ! TARGET_64BIT)				\
+    {									\
+      error ("-maix64 required: 64-bit computation with 32-bit addressing not yet supported."); \
+    }									\
 } while (0);
 
 #undef ASM_SPEC
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 36c50b4..b3d3913 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3491,7 +3491,7 @@ print_operand (file, x, code)
 	      || (GET_CODE (XEXP (XEXP (x, 0), 0)) != SYMBOL_REF
 		  && GET_CODE (XEXP (XEXP (x, 0), 0)) != LABEL_REF)
 	      || GET_CODE (XEXP (XEXP (x, 0), 1)) != CONST_INT)
-	    output_operand_lossage ("invalid %%l value");
+	    output_operand_lossage ("invalid %%K value");
 	  print_operand_address (file, XEXP (XEXP (x, 0), 0));
 	  fputs ("@l", file);
 	  print_operand (file, XEXP (XEXP (x, 0), 1), 0);
@@ -4073,7 +4073,7 @@ output_cbranch (op, label, reversed, insn)
   else
     s += sprintf (s, "b%s%s ", ccode, pred);
 
-  s += sprintf (s, "cr%d", cc_regno);
+  s += sprintf (s, "%d", cc_regno);
 
   if (label != NULL)
     {
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 890c415..b0dcbf4 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -2381,7 +2381,7 @@ extern int toc_initialized;
 
 #define ASM_OUTPUT_DEF_FROM_DECLS(FILE,decl,target)	\
 do {							\
-  char * alias = XSTR (XEXP (DECL_RTL (decl), 0), 0);	\
+  const char * alias = XSTR (XEXP (DECL_RTL (decl), 0), 0); \
   char * name = IDENTIFIER_POINTER (target);		\
   if (TREE_CODE (decl) == FUNCTION_DECL			\
       && DEFAULT_ABI == ABI_AIX)			\
diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c
index 695beb6..e706acc 100644
--- a/gcc/xcoffout.c
+++ b/gcc/xcoffout.c
@@ -61,14 +61,14 @@ static int xcoff_inlining = 0;
 
 /* Name of the current include file.  */
 
-char *xcoff_current_include_file;
+const char *xcoff_current_include_file;
 
 /* Name of the current function file.  This is the file the `.bf' is
    emitted from.  In case a line is emitted from a different file,
    (by including that file of course), then the line number will be
    absolute.  */
 
-static char *xcoff_current_function_file;
+static const char *xcoff_current_function_file;
 
 /* Names of bss and data sections.  These should be unique names for each
    compilation unit.  */
@@ -79,7 +79,7 @@ char *xcoff_read_only_section_name;
 
 /* Last source file name mentioned in a NOTE insn.  */
 
-char *xcoff_lastfile;
+const char *xcoff_lastfile;
 
 /* Macro definitions used below.  */
 
@@ -329,7 +329,7 @@ stab_to_sclass (stab)
 void
 xcoffout_source_file (file, filename, inline_p)
      FILE *file;
-     char *filename;
+     const char *filename;
      int inline_p;
 {
   if (filename
@@ -354,7 +354,7 @@ xcoffout_source_file (file, filename, inline_p)
 	}
       
       if (!xcoff_lastfile)
-	ggc_add_string_root (&xcoff_lastfile, 1);
+	ggc_add_string_root ((char **) &xcoff_lastfile, 1);
 
       xcoff_lastfile = filename;
     }
@@ -366,7 +366,7 @@ xcoffout_source_file (file, filename, inline_p)
 void
 xcoffout_source_line (file, filename, note)
      FILE *file;
-     char *filename;
+     const char *filename;
      rtx note;
 {
   xcoffout_source_file (file, filename, RTX_INTEGRATED_P (note));
@@ -460,9 +460,9 @@ void
 xcoffout_declare_function (file, decl, name)
      FILE *file;
      tree decl;
-     char *name;
+     const char *name;
 {
-  char *n = name;
+  char *n = (char *) name;
   int i;
 
   if (*n == '*')
@@ -537,7 +537,7 @@ xcoffout_end_epilogue (file)
      aux entry.  So, we emit a label after the last instruction which can
      be used by the .function pseudo op to calculate the function size.  */
 
-  char *fname = XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0);
+  const char *fname = XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0);
   if (*fname == '*')
     ++fname;
   fprintf (file, "FE..");
diff --git a/gcc/xcoffout.h b/gcc/xcoffout.h
index 5e912be..ebf9413 100644
--- a/gcc/xcoffout.h
+++ b/gcc/xcoffout.h
@@ -136,7 +136,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Name of the current include file.  */
 
-extern char *xcoff_current_include_file;
+extern const char *xcoff_current_include_file;
 
 /* Names of bss and data sections.  These should be unique names for each
    compilation unit.  */
@@ -147,7 +147,7 @@ extern char *xcoff_read_only_section_name;
 
 /* Last source file name mentioned in a NOTE insn.  */
 
-extern char *xcoff_lastfile;
+extern const char *xcoff_lastfile;
 
 /* Don't write out path name for main source file.  */
 #define DBX_OUTPUT_MAIN_SOURCE_DIRECTORY(FILE,FILENAME)
@@ -200,12 +200,12 @@ extern void xcoffout_end_block			PARAMS ((FILE *, int, int));
 #ifdef TREE_CODE
 extern void xcoff_output_standard_types		PARAMS ((tree));
 #ifdef BUFSIZ
-extern void xcoffout_declare_function		PARAMS ((FILE *, tree, char *));
+extern void xcoffout_declare_function		PARAMS ((FILE *, tree, const char *));
 #endif /* BUFSIZ */
 #endif /* TREE_CODE */
 
 #ifdef RTX_CODE
 #ifdef BUFSIZ
-extern void xcoffout_source_line		PARAMS ((FILE *, char *, rtx));
+extern void xcoffout_source_line		PARAMS ((FILE *, const char *, rtx));
 #endif /* BUFSIZ */
 #endif /* RTX_CODE */