Module Name:    src
Committed By:   mrg
Date:           Tue Nov  6 06:17:29 UTC 2018

Modified Files:
        src/external/gpl3/gcc/dist/gcc: ipa-inline.c
        src/external/gpl3/gcc/usr.bin/backend: Makefile

Log Message:
- 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.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/gpl3/gcc/dist/gcc/ipa-inline.c
cvs rdiff -u -r1.50 -r1.51 src/external/gpl3/gcc/usr.bin/backend/Makefile

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/ipa-inline.c
diff -u src/external/gpl3/gcc/dist/gcc/ipa-inline.c:1.1.1.5 src/external/gpl3/gcc/dist/gcc/ipa-inline.c:1.2
--- src/external/gpl3/gcc/dist/gcc/ipa-inline.c:1.1.1.5	Sun Nov  4 00:12:42 2018
+++ src/external/gpl3/gcc/dist/gcc/ipa-inline.c	Tue Nov  6 06:17:29 2018
@@ -2435,7 +2435,11 @@ ipa_inline (void)
      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

Index: src/external/gpl3/gcc/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.50 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.51
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.50	Sun Jul 15 00:59:49 2018
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile	Tue Nov  6 06:17:29 2018
@@ -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 @@ CPPFLAGS+=	${BOTH_CPPFLAGS} -DTARGET_NAM
 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}
 

Reply via email to