Adapt to GCC 6 (and 7, 8, and 9 for good measure).

This commit is contained in:
Jerry James 2016-02-04 18:57:06 -07:00
parent 14d0126279
commit d40616d90b
1 changed files with 5 additions and 5 deletions

View File

@ -1,11 +1,11 @@
--- ./src/makemake.in.orig 2013-02-16 15:26:28.000000000 -0700
+++ ./src/makemake.in 2015-02-11 17:20:00.000000000 -0700
+++ ./src/makemake.in 2016-02-04 17:10:00.000000000 -0700
@@ -1217,7 +1217,7 @@ if [ $XCC_GCC = true ] ; then
if [ $CROSS = false ] ; then
case "$XCC_GCC_VERSION" in
# gcc 2.7 introduced an annoying warning, but gcc 2.8 has a workaround:
- 2.[8-9]* | 3.* | 4.* | egcs-2.*)
+ 2.[8-9]* | 3.* | 4.* | 5.* | egcs-2.*)
+ 2.[8-9]* | [3-9].* | egcs-2.*)
XCFLAGS=$XCFLAGS' -Wno-sign-compare -Wno-format-nonliteral'
;;
* ) ;;
@ -14,7 +14,7 @@
case "$XCC_GCC_VERSION" in
# g++ 3.4 introduced an annoying warning, but has a workaround:
- 3.[4-9]* | 4.*)
+ 3.[4-9]* | 4.* | 5.*)
+ 3.[4-9]* | [4-9].*)
XCFLAGS=$XCFLAGS' -Wno-invalid-offsetof'
;;
* ) ;;
@ -23,7 +23,7 @@
# also fixed through the specs file of some Linux distributions).
XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations -fno-strength-reduce' ;;
- 2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | egcs-2.*)
+ 2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | 5.* | egcs-2.*)
+ 2.3.[2-9]* | 2.[4-9]* | [3-9].* | egcs-2.*)
XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations' ;;
* )
XCFLAGS=$XCFLAGS' -O' ;;
@ -32,7 +32,7 @@
fi # with_debug
case "$XCC_GCC_VERSION" in
- 3* | 4*)
+ 3* | 4* | 5*)
+ [3-9]*)
# When not optimizing on linux, or with Apple's gcc 4 on MacOS X,
# or with GCC 4 when "gcc -Os" is used:
# C_CODE_ALIGNMENT is wrong. &EVAL-WHEN = 0x806D512