Module Name: src Committed By: mrg Date: Thu Feb 22 07:24:19 UTC 2018
Modified Files: src/external/gpl3/gcc/dist/gcc: genemit.c genrecog.c hwint.h Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/genemit.c \ src/external/gpl3/gcc/dist/gcc/genrecog.c \ src/external/gpl3/gcc/dist/gcc/hwint.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/external/gpl3/gcc/dist/gcc/genemit.c diff -u src/external/gpl3/gcc/dist/gcc/genemit.c:1.5 src/external/gpl3/gcc/dist/gcc/genemit.c:1.6 --- src/external/gpl3/gcc/dist/gcc/genemit.c:1.5 Fri Feb 2 03:41:03 2018 +++ src/external/gpl3/gcc/dist/gcc/genemit.c Thu Feb 22 07:24:19 2018 @@ -188,7 +188,7 @@ gen_exp (rtx x, enum rtx_code subroutine 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 ("))"); } Index: src/external/gpl3/gcc/dist/gcc/genrecog.c diff -u src/external/gpl3/gcc/dist/gcc/genrecog.c:1.5 src/external/gpl3/gcc/dist/gcc/genrecog.c:1.6 --- src/external/gpl3/gcc/dist/gcc/genrecog.c:1.5 Fri Feb 2 03:41:03 2018 +++ src/external/gpl3/gcc/dist/gcc/genrecog.c Thu Feb 22 07:24:19 2018 @@ -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. */ Index: src/external/gpl3/gcc/dist/gcc/hwint.h diff -u src/external/gpl3/gcc/dist/gcc/hwint.h:1.5 src/external/gpl3/gcc/dist/gcc/hwint.h:1.6 --- src/external/gpl3/gcc/dist/gcc/hwint.h:1.5 Fri Feb 2 03:41:03 2018 +++ src/external/gpl3/gcc/dist/gcc/hwint.h Thu Feb 22 07:24:19 2018 @@ -99,11 +99,9 @@ typedef HOST_WIDE_INT __gcc_host_wide_in #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