[src/trunk]: src/external/gpl3/gcc/dist/gcc/c-family from the new comment:

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

details:   https://anonhg.NetBSD.org/src/rev/9c9c04bf61f1
branches:  trunk
changeset: 448565:9c9c04bf61f1
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Feb 05 08:53:50 2019 +0000

description:
from the new comment:

/*
 * NetBSD/sparc64 long ago defined signed and unsigned fast{8,16,32} to be
 * different to the common sparc64 definitions, and they are not the same
 * size for the same bitsize.  GCC 7 introduced checks that they are the
 * same size below that trigger here.
 *
 * NETBSD_TOOLS/NETBSD_NATIVE is wrong for this, but it will do for now.
 */

diffstat:

 external/gpl3/gcc/dist/gcc/c-family/c-cppbuiltin.c |  20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r d4822c3c66a0 -r 9c9c04bf61f1 external/gpl3/gcc/dist/gcc/c-family/c-cppbuiltin.c
--- a/external/gpl3/gcc/dist/gcc/c-family/c-cppbuiltin.c        Tue Feb 05 08:53:18 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/c-family/c-cppbuiltin.c        Tue Feb 05 08:53:50 2019 +0000
@@ -512,22 +512,35 @@
       builtin_define_type_max ("__UINT_LEAST64_MAX__", uint_least64_type_node);
       builtin_define_constants ("__UINT64_C", uint_least64_type_node);
     }
+/*
+ * NetBSD/sparc64 long ago defined signed and unsigned fast{8,16,32} to be
+ * different to the common sparc64 definitions, and they are not the same
+ * size for the same bitsize.  GCC 7 introduced checks that they are the
+ * same size below that trigger here.
+ *
+ * NETBSD_TOOLS/NETBSD_NATIVE is wrong for this, but it will do for now.
+ */
+#if defined(NETBSD_TOOLS) || defined(NETBSD_NATIVE)
+#define builtin_define_type_width_nb(a,b,c)    builtin_define_type_width(a,b,NULL_TREE)
+#else
+#define builtin_define_type_width_nb(a,b,c)    builtin_define_type_width(a,b,c)
+#endif
   if (int_fast8_type_node)
     {
       builtin_define_type_max ("__INT_FAST8_MAX__", int_fast8_type_node);
-      builtin_define_type_width ("__INT_FAST8_WIDTH__", int_fast8_type_node,
+      builtin_define_type_width_nb ("__INT_FAST8_WIDTH__", int_fast8_type_node,
                                 uint_fast8_type_node);
     }
   if (int_fast16_type_node)
     {
       builtin_define_type_max ("__INT_FAST16_MAX__", int_fast16_type_node);
-      builtin_define_type_width ("__INT_FAST16_WIDTH__", int_fast16_type_node,
+      builtin_define_type_width_nb ("__INT_FAST16_WIDTH__", int_fast16_type_node,
                                 uint_fast16_type_node);
     }
   if (int_fast32_type_node)
     {
       builtin_define_type_max ("__INT_FAST32_MAX__", int_fast32_type_node);
-      builtin_define_type_width ("__INT_FAST32_WIDTH__", int_fast32_type_node,
+      builtin_define_type_width_nb ("__INT_FAST32_WIDTH__", int_fast32_type_node,
                                 uint_fast32_type_node);
     }
   if (int_fast64_type_node)
@@ -536,6 +549,7 @@
       builtin_define_type_width ("__INT_FAST64_WIDTH__", int_fast64_type_node,
                                 uint_fast64_type_node);
     }
+#undef builtin_define_type_width_nb
   if (uint_fast8_type_node)
     builtin_define_type_max ("__UINT_FAST8_MAX__", uint_fast8_type_node);
   if (uint_fast16_type_node)