From 5db9d41be9a5285b07d0627762c4cbcde9e57b85 Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Wed, 2 May 2018 16:50:54 +0300
Subject: [PATCH] gcc80: Mark few sources as special for narrowing.

While there, add -Wpragmas suppression for gcc47.
---
 gnu/usr.bin/cc80/libbackend/Makefile                    | 10 ++++++++++
 gnu/usr.bin/cc80/support-libs/libcommon-target/Makefile |  5 +++++
 gnu/usr.bin/cc80/support-libs/libcommon/Makefile        |  5 +++++
 3 files changed, 20 insertions(+)

diff --git a/gnu/usr.bin/cc80/libbackend/Makefile b/gnu/usr.bin/cc80/libbackend/Makefile
index 8d279efb56..973c5d6a84 100644
--- a/gnu/usr.bin/cc80/libbackend/Makefile
+++ b/gnu/usr.bin/cc80/libbackend/Makefile
@@ -423,6 +423,16 @@ OBJS=	${BACKEND_OBJS}
 SRCS=	gimple-loop-interchange.cc unique-ptr-tests.cc \
 	wide-int.cc wide-int-print.cc
 
+# for gimple-ssa-sprintf.c
+.if ${CCVER:Mgcc47}
+CXXFLAGS+=	-Wno-pragmas
+.endif
+
+# for tree-ssa-structalias.c, tree-vect-stmts.c
+.if ${CCVER:Mgcc80}
+CXXFLAGS+=	-Wno-narrowing
+.endif
+
 # hack to force c++ compiler to compile *.c files to create library
 .for cfile in ${BACKEND_OBJS}
 ${cfile}: ${cfile:.o=.c}
diff --git a/gnu/usr.bin/cc80/support-libs/libcommon-target/Makefile b/gnu/usr.bin/cc80/support-libs/libcommon-target/Makefile
index 6559127b29..f36cec81cb 100644
--- a/gnu/usr.bin/cc80/support-libs/libcommon-target/Makefile
+++ b/gnu/usr.bin/cc80/support-libs/libcommon-target/Makefile
@@ -16,6 +16,11 @@ common_out_object_file=	i386-common.o
 OBJS=		${OBJS-libcommon-target}
 CFLAGS+=	-DPREFIX=\"${TOOLS_PREFIX}/usr\"
 
+# for opts-common.c
+.if ${CCVER:Mgcc80}
+CXXFLAGS+=	-Wno-narrowing
+.endif
+
 .for ofile in ${OBJS-libcommon-target}
 ${ofile}: ${ofile:.o=.c}
 	${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
diff --git a/gnu/usr.bin/cc80/support-libs/libcommon/Makefile b/gnu/usr.bin/cc80/support-libs/libcommon/Makefile
index 4b2939458e..1986a9ee0b 100644
--- a/gnu/usr.bin/cc80/support-libs/libcommon/Makefile
+++ b/gnu/usr.bin/cc80/support-libs/libcommon/Makefile
@@ -13,6 +13,11 @@ SRCS+=		memory-block.cc
 OBJS+=		${OBJS-libcommon}
 CFLAGS+=	-I${GCCDIR}/libbacktrace
 
+# for pretty-print.c
+.if ${CCVER:Mgcc80}
+CXXFLAGS+=	-Wno-narrowing
+.endif
+
 .for ofile in ${OBJS-libcommon}
 ${ofile}: ${ofile:.o=.c}
 	${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-- 
2.11.4.GIT