MIPS: Bugfix for fix Dejagnu issues with RTL checking enabled.
Commit Message
From: Robert Suchanek <robert.suchanek@imgtec.com>
gcc/ChangeLog:
* config/mips/mips.cc (mips_set_text_contents_type): Modified parameter
* config/mips/mips-protos.h (mips_set_text_contents_type): Likewise
Signed-off-by: Xin Liu <xin.liu@oss.cipunited.com>
---
gcc/config/mips/mips-protos.h | 2 +-
gcc/config/mips/mips.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Comments
"Xin Liu" <xin.liu@oss.cipunited.com> writes:
> From: Robert Suchanek <robert.suchanek@imgtec.com>
>
> gcc/ChangeLog:
>
> * config/mips/mips.cc (mips_set_text_contents_type): Modified parameter
> * config/mips/mips-protos.h (mips_set_text_contents_type): Likewise
>
> Signed-off-by: Xin Liu <xin.liu@oss.cipunited.com>
Thanks, pushed to trunk. I guess this is a regression from GCC 6.
Richard
>
> ---
> gcc/config/mips/mips-protos.h | 2 +-
> gcc/config/mips/mips.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gcc/config/mips/mips-protos.h b/gcc/config/mips/mips-protos.h
> index 75432677da2..fae71fe776c 100644
> --- a/gcc/config/mips/mips-protos.h
> +++ b/gcc/config/mips/mips-protos.h
> @@ -272,7 +272,7 @@ extern void mips_declare_object (FILE *, const char *, const char *,
> extern void mips_declare_object_name (FILE *, const char *, tree);
> extern void mips_finish_declare_object (FILE *, tree, int, int);
> extern void mips_set_text_contents_type (FILE *, const char *,
> - unsigned long, bool);
> + unsigned HOST_WIDE_INT, bool);
>
> extern bool mips_small_data_pattern_p (rtx);
> extern rtx mips_rewrite_small_data (rtx);
> diff --git a/gcc/config/mips/mips.cc b/gcc/config/mips/mips.cc
> index fb903a2a630..2d87d4f3627 100644
> --- a/gcc/config/mips/mips.cc
> +++ b/gcc/config/mips/mips.cc
> @@ -11090,7 +11090,7 @@ mips_finish_declare_object (FILE *stream, tree decl, int top_level, int at_end)
> void
> mips_set_text_contents_type (FILE *file ATTRIBUTE_UNUSED,
> const char *prefix ATTRIBUTE_UNUSED,
> - unsigned long num ATTRIBUTE_UNUSED,
> + unsigned HOST_WIDE_INT num ATTRIBUTE_UNUSED,
> bool function_p ATTRIBUTE_UNUSED)
> {
> #ifdef ASM_OUTPUT_TYPE_DIRECTIVE
> @@ -11099,7 +11099,7 @@ mips_set_text_contents_type (FILE *file ATTRIBUTE_UNUSED,
> char *sname;
> rtx symbol;
>
> - sprintf (buf, "%lu", num);
> + sprintf (buf, HOST_WIDE_INT_PRINT_UNSIGNED, num);
> symbol = XEXP (DECL_RTL (current_function_decl), 0);
> fnname = targetm.strip_name_encoding (XSTR (symbol, 0));
> sname = ACONCAT ((prefix, fnname, "_", buf, NULL));
@@ -272,7 +272,7 @@ extern void mips_declare_object (FILE *, const char *, const char *,
extern void mips_declare_object_name (FILE *, const char *, tree);
extern void mips_finish_declare_object (FILE *, tree, int, int);
extern void mips_set_text_contents_type (FILE *, const char *,
- unsigned long, bool);
+ unsigned HOST_WIDE_INT, bool);
extern bool mips_small_data_pattern_p (rtx);
extern rtx mips_rewrite_small_data (rtx);
@@ -11090,7 +11090,7 @@ mips_finish_declare_object (FILE *stream, tree decl, int top_level, int at_end)
void
mips_set_text_contents_type (FILE *file ATTRIBUTE_UNUSED,
const char *prefix ATTRIBUTE_UNUSED,
- unsigned long num ATTRIBUTE_UNUSED,
+ unsigned HOST_WIDE_INT num ATTRIBUTE_UNUSED,
bool function_p ATTRIBUTE_UNUSED)
{
#ifdef ASM_OUTPUT_TYPE_DIRECTIVE
@@ -11099,7 +11099,7 @@ mips_set_text_contents_type (FILE *file ATTRIBUTE_UNUSED,
char *sname;
rtx symbol;
- sprintf (buf, "%lu", num);
+ sprintf (buf, HOST_WIDE_INT_PRINT_UNSIGNED, num);
symbol = XEXP (DECL_RTL (current_function_decl), 0);
fnname = targetm.strip_name_encoding (XSTR (symbol, 0));
sname = ACONCAT ((prefix, fnname, "_", buf, NULL));