1 files changed, 9 insertions, 0 deletions

diff --git a/tools/configure b/tools/configure
index 4c742f500f..4910dcb000 100755
--- a/tools/configure
+++ b/tools/configure
@@ -237,6 +237,9 @@ simcc () {
  GCCOPTS=`echo $CCOPTS | sed -e s/-ffreestanding// -e s/-nostdlib// -e s/-Wundef//`
 
  GCCOPTS="$GCCOPTS -fno-builtin -g"
+ # Some linux setups like to warn about unused results. They are correct,
+ # but cleaning this up is a lot of work.
+ GCCOPTS="$GCCOPTS -Wno-unused-result"
  GCCOPTIMIZE=''
  LDOPTS="$LDOPTS -lm" # button-sdl.c uses sqrt()
  sigaltstack=""
@@ -4189,6 +4192,12 @@ else
    GCCOPTS="$GCCOPTS -Wno-override-init"
  fi
 
+ if test "$gccnum" -ge "601"; then
+   # gcc 6 adds a lot of warnings that while useful are too time-consuming
+   # to clean up right away
+   GCCOPTS="$GCCOPTS -Wno-shift-negative-value -Wno-unused-const-variable -Wno-nonnull-compare -Wno-tautological-compare"
+ fi
+
  case $prefix in
    ""|"$CROSS_COMPILE")
      # simulator