- rel 2; fix build with gcc 8

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d4b603499b05f64e51b96e527678c26a94700ef8..e56acbbc763e93336a2fc5e4d60c17e675b58f1e 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,3 +26,29 @@
                                exit
                        fi
                done
+commit 80d172431696482d9acd8d2c4ea78fed8956e2a1
+Author: valdis.kletnieks@vt.edu <valdis.kletnieks@vt.edu>
+Date:   Sun Feb 4 12:01:43 2018 -0500
+
+    gcc-plugins: Add include required by GCC release 8
+    
+    GCC requires another #include to get the gcc-plugins to build cleanly.
+    
+    Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
+    Signed-off-by: Kees Cook <keescook@chromium.org>
+
+diff --git a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
+index ffd1dfaa1cc1..f46750053377 100644
+--- a/scripts/gcc-plugins/gcc-common.h
++++ b/scripts/gcc-plugins/gcc-common.h
+@@ -97,6 +97,10 @@
+ #include "predict.h"
+ #include "ipa-utils.h"
+ 
++#if BUILDING_GCC_VERSION >= 8000
++#include "stringpool.h"
++#endif
++
+ #if BUILDING_GCC_VERSION >= 4009
+ #include "attribs.h"
+ #include "varasm.h"

diff --git a/kernel.spec b/kernel.spec
index b0da4d36fe4ccb3799a2ca21062dce0d2b75086d..7539660e00e4c2edf90de0bca28a866c2d93a06c 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             1
+%define                rel             2
 %define                basever         4.14
 %define                postver         .59