[src/trunk]: src/external/gpl3/gcc - make the build depend upon the BASE-VER ...

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

details:   https://anonhg.NetBSD.org/src/rev/20ef351f5b6b
branches:  trunk
changeset: 445618:20ef351f5b6b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Nov 06 06:17:29 2018 +0000

description:
- make the build depend upon the BASE-VER file.
- workaround a problem only see with -O2 in ipa-inline.c: it can't
  convince itself that an integer underflow can't happen.

diffstat:

 external/gpl3/gcc/dist/gcc/ipa-inline.c    |  6 +++++-
 external/gpl3/gcc/usr.bin/backend/Makefile |  3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 76a8141c491a -r 20ef351f5b6b external/gpl3/gcc/dist/gcc/ipa-inline.c
--- a/external/gpl3/gcc/dist/gcc/ipa-inline.c   Tue Nov 06 06:16:00 2018 +0000
+++ b/external/gpl3/gcc/dist/gcc/ipa-inline.c   Tue Nov 06 06:17:29 2018 +0000
@@ -2435,7 +2435,11 @@
      could remove other nodes with flatten attribute.  See PR82801.  */
   struct cgraph_node_hook_list *node_removal_hook_holder = NULL;
   hash_set<struct cgraph_node *> *flatten_removed_nodes = NULL;
-  if (j < nnodes - 2)
+  /*
+   * XXXMRG: added "nnodes > 1" as -O2 (but not -O) warn:
+   *    "assuming signed overflow does not occur"
+   */
+  if (nnodes > 1 && j < nnodes - 2)
     {
       flatten_removed_nodes = new hash_set<struct cgraph_node *>;
       node_removal_hook_holder
diff -r 76a8141c491a -r 20ef351f5b6b external/gpl3/gcc/usr.bin/backend/Makefile
--- a/external/gpl3/gcc/usr.bin/backend/Makefile        Tue Nov 06 06:16:00 2018 +0000
+++ b/external/gpl3/gcc/usr.bin/backend/Makefile        Tue Nov 06 06:17:29 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.50 2018/07/15 00:59:49 christos Exp $
+#      $NetBSD: Makefile,v 1.51 2018/11/06 06:17:29 mrg Exp $
 
 LIBISPRIVATE=  yes
 
@@ -18,6 +18,7 @@
 HOST_CPPFLAGS+=        -I${HOST_LIBIBERTYOBJ}/libiberty
 HOST_CPPFLAGS+=        ${BOTH_CPPFLAGS} -DGENERATOR_FILE
 DPSRCS+=       insn-attr.h insn-codes.h insn-config.h insn-flags.h tree-check.h
+DPSRCS+=       ${DIST}/gcc/BASE-VER
 CPPFLAGS+=     -I${DIST}/libgcc
 CPPFLAGS+=     -I${.CURDIR}/../../lib/libgcc/libgcov/arch/${MACHINE_ARCH}