From c9dba74273d38b940a00979a7e7af979c13420e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
Date: Thu, 5 May 2016 18:15:56 +0200
Subject: [PATCH] Added some support for GCC 7.

---
 configure                  | 2 +-
 headers/build/os/BeBuild.h | 2 +-
 headers/os/BeBuild.h       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 24f87e594e..aadd8f68fd 100755
--- a/configure
+++ b/configure
@@ -815,7 +815,7 @@ else
 			get_build_tool_path STRIP_$targetArch ${crossToolsPrefix}strip
 
 			case `get_variable HAIKU_GCC_RAW_VERSION_$targetArch` in
-				4.*|5.*|6.*)
+				4.*|5.*|6.*|7.*)
 					get_build_tool_path ELFEDIT_$targetArch \
 						${crossToolsPrefix}elfedit
 				;;
diff --git a/headers/build/os/BeBuild.h b/headers/build/os/BeBuild.h
index 62a716598b..8d349beaf2 100644
--- a/headers/build/os/BeBuild.h
+++ b/headers/build/os/BeBuild.h
@@ -37,7 +37,7 @@
 
 #if __GNUC__ == 2
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_2_HAIKU
-#elif __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5
+#elif __GNUC__ >= 3 && __GNUC__ <= 7
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_4
 #else
 #	error Unsupported gcc version!
diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h
index 6eacecf366..850c794e95 100644
--- a/headers/os/BeBuild.h
+++ b/headers/os/BeBuild.h
@@ -45,7 +45,7 @@
 
 #if __GNUC__ == 2
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_2_HAIKU
-#elif __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6
+#elif __GNUC__ >= 4 && __GNUC__ <= 7
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_4
 #else
 #	error Unsupported gcc version!