From d73bfd1a42aae2b31168acd7827eeb24494cf289 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Sun, 17 May 2020 18:41:01 -0400
Subject: pdbox/doom: Use -Wno-stringop-truncation with GCC >=8

This should shut up a lot of the sim build failures

Change-Id: Ieaa387585cb8ca0f8b2faff24c08aad9451b28ce
---
 apps/plugins/doom/doom.make   |  4 ++++
 apps/plugins/pdbox/pdbox.make | 10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/plugins/doom/doom.make b/apps/plugins/doom/doom.make
index 0ebdf384a1..8be7620feb 100644
--- a/apps/plugins/doom/doom.make
+++ b/apps/plugins/doom/doom.make
@@ -24,6 +24,10 @@ DOOMCFLAGS = $(PLUGINFLAGS) -Wno-strict-prototypes -O2 -fno-strict-aliasing
 ifeq ($(shell expr $(GCCNUM) \> 401),1)
     DOOMCFLAGS += -fgnu89-inline
 endif
+# Disable stringop-truncation warnings on GCC 8 or greater
+ifeq ($(shell expr $(GCCNUM) \> 800),1)
+    DOOMCFLAGS += -Wno-stringop-truncation
+endif
 
 ifndef APP_TYPE
 ifeq ($(TARGET), IRIVER_H100)
diff --git a/apps/plugins/pdbox/pdbox.make b/apps/plugins/pdbox/pdbox.make
index 7ec998dc5e..a9ce0d2755 100644
--- a/apps/plugins/pdbox/pdbox.make
+++ b/apps/plugins/pdbox/pdbox.make
@@ -20,12 +20,18 @@ OTHER_SRC += $(PDBOX_SRC)
 
 $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(MPEG_OBJ)
 
-PDBOXFLAGS = $(PLUGINFLAGS) -fno-strict-aliasing -Wno-cast-function-type 
-PDBOXLDFLAGS = $(PLUGINLDFLAGS) 
+PDBOXFLAGS = $(PLUGINFLAGS) -fno-strict-aliasing -Wno-cast-function-type
+PDBOXLDFLAGS = $(PLUGINLDFLAGS)
 ifdef APP_TYPE
 PDBOXLDFLAGS += -lm
 endif
 
+# Disable stringop-truncation warnings on GCC 8 or greater
+ifeq ($(shell expr $(GCCNUM) \> 800),1)
+    PDBOXFLAGS += -Wno-stringop-truncation
+endif
+
+
 $(PDBOXBUILDDIR)/pdbox.rock: $(PDBOX_OBJ) $(TLSFLIB)
 
 # Compile PDBox with extra flags (adapted from ZXBox)
-- 
cgit v1.2.3