[src/trunk]: src/external/gpl3/gcc/dist/gcc re-port the patch from https://gc...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fc53ac2fb311
branches:  trunk
changeset: 359711:fc53ac2fb311
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Feb 22 07:24:19 2018 +0000

description:
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:

 external/gpl3/gcc/dist/gcc/genemit.c  |  2 +-
 external/gpl3/gcc/dist/gcc/genrecog.c |  4 ++--
 external/gpl3/gcc/dist/gcc/hwint.h    |  2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diffs (42 lines):

diff -r 569e25026af5 -r fc53ac2fb311 external/gpl3/gcc/dist/gcc/genemit.c
--- a/external/gpl3/gcc/dist/gcc/genemit.c      Thu Feb 22 07:21:10 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/genemit.c      Thu Feb 22 07:24:19 2018 +0000
@@ -188,7 +188,7 @@
        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 -r 569e25026af5 -r fc53ac2fb311 external/gpl3/gcc/dist/gcc/genrecog.c
--- a/external/gpl3/gcc/dist/gcc/genrecog.c     Thu Feb 22 07:21:10 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/genrecog.c     Thu Feb 22 07:24:19 2018 +0000
@@ -4416,9 +4416,9 @@
 {
   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 -r 569e25026af5 -r fc53ac2fb311 external/gpl3/gcc/dist/gcc/hwint.h
--- a/external/gpl3/gcc/dist/gcc/hwint.h        Thu Feb 22 07:21:10 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/hwint.h        Thu Feb 22 07:24:19 2018 +0000
@@ -99,11 +99,9 @@
 #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