From 7a6942ad82eae4db785a643b1f506e1778fc1e87 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Wed, 2 Jul 2008 06:43:45 +0000 Subject: [PATCH] alpha.c (alpha_need_linkage, [...]): Fix -Wc++-compat and/or -Wcast-qual warnings. * config/alpha/alpha.c (alpha_need_linkage, alpha_use_linkage): Fix -Wc++-compat and/or -Wcast-qual warnings. * config/i386/netware.c (gen_stdcall_or_fastcall_decoration, gen_regparm_prefix): Likewise. * vmsdbgout.c (write_modbeg, lookup_filename, vmsdbgout_source_line, vmsdbgout_init): Likewise. From-SVN: r137341 --- gcc/ChangeLog | 9 +++++++++ gcc/config/alpha/alpha.c | 4 ++-- gcc/config/i386/netware.c | 4 ++-- gcc/vmsdbgout.c | 18 +++++++----------- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4658c491849..fe4267560fd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2008-07-02 Kaveh R. Ghazi + + * config/alpha/alpha.c (alpha_need_linkage, alpha_use_linkage): + Fix -Wc++-compat and/or -Wcast-qual warnings. + * config/i386/netware.c (gen_stdcall_or_fastcall_decoration, + gen_regparm_prefix): Likewise. + * vmsdbgout.c (write_modbeg, lookup_filename, + vmsdbgout_source_line, vmsdbgout_init): Likewise. + 2008-07-02 Danny Smith * config/i386/mingw32.h (TARGET_USE_JCR_SECTION): Undef to let diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index f878e866f5f..350994234cd 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -9489,7 +9489,7 @@ alpha_need_linkage (const char *name, int is_local) /* Construct a SYMBOL_REF for us to call. */ { size_t name_len = strlen (name); - char *linksym = alloca (name_len + 6); + char *linksym = XALLOCAVEC (char, name_len + 6); linksym[0] = '$'; memcpy (linksym + 1, name, name_len); memcpy (linksym + 1 + name_len, "..lk", 5); @@ -9556,7 +9556,7 @@ alpha_use_linkage (rtx linkage, tree cfundecl, int lflag, int rflag) sprintf (buf, "$%d..%s..lk", cfaf->num, name); buflen = strlen (buf); - linksym = alloca (buflen + 1); + linksym = XALLOCAVEC (char, buflen + 1); memcpy (linksym, buf, buflen + 1); al->linkage = gen_rtx_SYMBOL_REF diff --git a/gcc/config/i386/netware.c b/gcc/config/i386/netware.c index 63c26cc7551..7f040d4b0e0 100644 --- a/gcc/config/i386/netware.c +++ b/gcc/config/i386/netware.c @@ -77,7 +77,7 @@ gen_stdcall_or_fastcall_decoration (tree decl, tree id, char prefix) } } - new_str = alloca (1 + strlen (old_str) + 1 + 10 + 1); + new_str = XALLOCAVEC (char, 1 + strlen (old_str) + 1 + 10 + 1); sprintf (new_str, "%c%s@" HOST_WIDE_INT_PRINT_UNSIGNED, prefix, old_str, total); @@ -132,7 +132,7 @@ gen_regparm_prefix (tree decl, tree id, unsigned int nregs) if (nregs > total / UNITS_PER_WORD) nregs = total / UNITS_PER_WORD; gcc_assert (nregs <= 9); - new_str = alloca (3 + strlen (old_str) + 1); + new_str = XALLOCAVEC (char, 3 + strlen (old_str) + 1); sprintf (new_str, "_%u@%s", nregs, old_str); return get_identifier (new_str); diff --git a/gcc/vmsdbgout.c b/gcc/vmsdbgout.c index 751e44cc0d4..6699f52e91c 100644 --- a/gcc/vmsdbgout.c +++ b/gcc/vmsdbgout.c @@ -715,7 +715,7 @@ write_modbeg (int dosizeonly) int totsize = 0; /* Assumes primary filename has Unix syntax file spec. */ - module_name = xstrdup (basename ((char *) primary_filename)); + module_name = xstrdup (lbasename (primary_filename)); m = strrchr (module_name, '.'); if (m) @@ -1510,9 +1510,8 @@ lookup_filename (const char *file_name) { file_info_table_allocated += FILE_TABLE_INCREMENT; - file_info_table = xrealloc (file_info_table, - (file_info_table_allocated - * sizeof (dst_file_info_entry))); + file_info_table = XRESIZEVEC (dst_file_info_entry, file_info_table, + file_info_table_allocated); } /* Add the new entry to the end of the filename table. */ @@ -1549,9 +1548,8 @@ vmsdbgout_source_line (register unsigned line, register const char *filename) if (line_info_table_in_use == line_info_table_allocated) { line_info_table_allocated += LINE_INFO_TABLE_INCREMENT; - line_info_table = xrealloc (line_info_table, - (line_info_table_allocated - * sizeof (dst_line_info_entry))); + line_info_table = XRESIZEVEC (dst_line_info_entry, line_info_table, + line_info_table_allocated); } /* Add the new entry at the end of the line_info_table. */ @@ -1600,8 +1598,7 @@ vmsdbgout_init (const char *main_input_filename) primary_filename = main_input_filename; /* Allocate the initial hunk of the file_info_table. */ - file_info_table - = xcalloc (FILE_TABLE_INCREMENT, sizeof (dst_file_info_entry)); + file_info_table = XCNEWVEC (dst_file_info_entry, FILE_TABLE_INCREMENT); file_info_table_allocated = FILE_TABLE_INCREMENT; /* Skip the first entry - file numbers begin at 1 */ @@ -1612,8 +1609,7 @@ vmsdbgout_init (const char *main_input_filename) func_table_in_use = 1; /* Allocate the initial hunk of the line_info_table. */ - line_info_table - = xcalloc (LINE_INFO_TABLE_INCREMENT, sizeof (dst_line_info_entry)); + line_info_table = XCNEWVEC (dst_line_info_entry, LINE_INFO_TABLE_INCREMENT); line_info_table_allocated = LINE_INFO_TABLE_INCREMENT; /* zero-th entry is allocated, but unused */ line_info_table_in_use = 1; -- 2.30.2