diff options
| author | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-07-04 11:14:13 +0000 |
|---|---|---|
| committer | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-07-04 11:14:13 +0000 |
| commit | a38b6c6008f76756909153237983c6c26b980f5e (patch) | |
| tree | 395868f7c9ae1a31e4ba814fc2c7a55b0c545509 /gcc | |
| parent | 402a4e1e1098bab6acbcb73f5ecd1e258f46e0e1 (diff) | |
| download | gcc-a38b6c6008f76756909153237983c6c26b980f5e.tar.gz | |
* rs6000/aix.h (ASM_GENERATE_INTERNAL_LABEL): Fix format specifier.
* xcoffout.c (assign_type_number): Constify.
(xcoffout_source_file): Add static prototype. Don't needlessly
cast away const-ness.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34866 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/rs6000/aix.h | 2 | ||||
| -rw-r--r-- | gcc/xcoffout.c | 18 |
3 files changed, 19 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 33086260349..074c22649fc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2000-07-04 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * rs6000/aix.h (ASM_GENERATE_INTERNAL_LABEL): Fix format specifier. + + * xcoffout.c (assign_type_number): Constify. + (xcoffout_source_file): Add static prototype. Don't needlessly + cast away const-ness. + 2000-07-04 Jason Merrill <jason@redhat.com> * frame.h (frame_state): Move base_offset to end. diff --git a/gcc/config/rs6000/aix.h b/gcc/config/rs6000/aix.h index 0487863212a..db781341b5d 100644 --- a/gcc/config/rs6000/aix.h +++ b/gcc/config/rs6000/aix.h @@ -462,7 +462,7 @@ toc_section () \ This is suitable for output with `assemble_name'. */ #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM) \ - sprintf (LABEL, "*%s..%d", PREFIX, NUM) + sprintf (LABEL, "*%s..%ld", (PREFIX), (long)(NUM)) /* This is how to output an assembler line to define N characters starting at P to FILE. */ diff --git a/gcc/xcoffout.c b/gcc/xcoffout.c index e706acc9950..7cfd636e915 100644 --- a/gcc/xcoffout.c +++ b/gcc/xcoffout.c @@ -117,8 +117,9 @@ const char *xcoff_lastfile; #define ASM_OUTPUT_LBE(FILE,LINENUM,BLOCKNUM) \ fprintf (FILE, "\t.eb\t%d\n", ABS_OR_RELATIVE_LINENO (LINENUM)) -static void assign_type_number PARAMS ((tree, char *, int)); +static void assign_type_number PARAMS ((tree, const char *, int)); static void xcoffout_block PARAMS ((tree, int, tree)); +static void xcoffout_source_file PARAMS ((FILE *, const char *, int)); /* Support routines for XCOFF debugging info. */ @@ -128,7 +129,7 @@ static void xcoffout_block PARAMS ((tree, int, tree)); static void assign_type_number (syms, name, number) tree syms; - char *name; + const char *name; int number; { tree decl; @@ -326,7 +327,7 @@ stab_to_sclass (stab) /* Output debugging info to FILE to switch to sourcefile FILENAME. INLINE_P is true if this is from an inlined function. */ -void +static void xcoffout_source_file (file, filename, inline_p) FILE *file; const char *filename; @@ -462,19 +463,19 @@ xcoffout_declare_function (file, decl, name) tree decl; const char *name; { - char *n = (char *) name; int i; - if (*n == '*') - n++; + if (*name == '*') + name++; else for (i = 0; name[i]; ++i) { if (name[i] == '[') { - n = (char *) alloca (i + 1); + char *n = (char *) alloca (i + 1); strncpy (n, name, i); n[i] = '\0'; + name = n; break; } } @@ -487,7 +488,8 @@ xcoffout_declare_function (file, decl, name) /* .function NAME, TOP, MAPPING, TYPE, SIZE 16 and 044 are placeholders for backwards compatibility */ - fprintf (file, "\t.function .%s,.%s,16,044,FE..%s-.%s\n", n, n, n, n); + fprintf (file, "\t.function .%s,.%s,16,044,FE..%s-.%s\n", + name, name, name, name); } /* Called at beginning of function body (after prologue). |