summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2018-02-22 07:24:19 +0000
committermrg <mrg@NetBSD.org>2018-02-22 07:24:19 +0000
commitef3ebcea2ef948164a2f1edc930ff5b33bdbec61 (patch)
tree83e2ad0c54d65c11fd658343adf42c20da39bd5a /external
parentc47da70d3f230cedfa269c531b74ac9bce3c359b (diff)
re-port the patch from https://gcc.gnu.org/bugzilla/attachment.cgi?id=15492.
- local HOST_WIDE_INT_CONSTANT macro same as new HOST_WIDE_INT_C macro, so use it instead, and remove the local macro. - re-port the genrecog.c change which was missed in early GCC-6 port. this makes sh3 work again.
Diffstat (limited to 'external')
-rw-r--r--external/gpl3/gcc/dist/gcc/genemit.c2
-rw-r--r--external/gpl3/gcc/dist/gcc/genrecog.c4
-rw-r--r--external/gpl3/gcc/dist/gcc/hwint.h2
3 files changed, 3 insertions, 5 deletions
diff --git a/external/gpl3/gcc/dist/gcc/genemit.c b/external/gpl3/gcc/dist/gcc/genemit.c
index 1b91346297c..eb4acabf19d 100644
--- a/external/gpl3/gcc/dist/gcc/genemit.c
+++ b/external/gpl3/gcc/dist/gcc/genemit.c
@@ -188,7 +188,7 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used)
printf ("const_true_rtx");
else
{
- printf ("GEN_INT (HOST_WIDE_INT_CONSTANT (");
+ printf ("GEN_INT (HOST_WIDE_INT_C (");
printf (HOST_WIDE_INT_PRINT_DEC, INTVAL (x));
printf ("))");
}
diff --git a/external/gpl3/gcc/dist/gcc/genrecog.c b/external/gpl3/gcc/dist/gcc/genrecog.c
index 47e42660fcc..25421b709d2 100644
--- a/external/gpl3/gcc/dist/gcc/genrecog.c
+++ b/external/gpl3/gcc/dist/gcc/genrecog.c
@@ -4416,9 +4416,9 @@ print_host_wide_int (uint64_t val)
{
uint64_t min = uint64_t (1) << (HOST_BITS_PER_WIDE_INT - 1);
if (val == min)
- printf ("(" HOST_WIDE_INT_PRINT_DEC_C " - 1)", val + 1);
+ printf ("( HOST_WIDE_INT_C (" HOST_WIDE_INT_PRINT_DEC ") - 1)", val + 1);
else
- printf (HOST_WIDE_INT_PRINT_DEC_C, val);
+ printf (" HOST_WIDE_INT_C (" HOST_WIDE_INT_PRINT_DEC ")", val);
}
/* Print the C expression for actual parameter PARAM. */
diff --git a/external/gpl3/gcc/dist/gcc/hwint.h b/external/gpl3/gcc/dist/gcc/hwint.h
index de05a303817..14740ccc939 100644
--- a/external/gpl3/gcc/dist/gcc/hwint.h
+++ b/external/gpl3/gcc/dist/gcc/hwint.h
@@ -99,11 +99,9 @@ typedef HOST_WIDE_INT __gcc_host_wide_int__;
#if INT64_T_IS_LONG
# define HOST_WIDE_INT_PRINT HOST_LONG_FORMAT
# define HOST_WIDE_INT_PRINT_C "L"
-# define HOST_WIDE_INT_CONSTANT(x) x ## L
#else
# define HOST_WIDE_INT_PRINT HOST_LONG_LONG_FORMAT
# define HOST_WIDE_INT_PRINT_C "LL"
-# define HOST_WIDE_INT_CONSTANT(x) x ## LL
#endif
#define HOST_WIDE_INT_PRINT_DEC "%" PRId64