From ce7c6c6b2d389ff6b796bf5de5fa5ef0e5c4f194 Mon Sep 17 00:00:00 2001
From: Sven Baars <s.baars@rug.nl>
Date: Mon, 17 Oct 2016 16:32:34 +0200
Subject: [PATCH 1/3] Fix HASWELL capitalization in kernel cmake file

Refs #951
---
 kernel/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 17c2b1b89..435478c98 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -118,7 +118,7 @@ endforeach ()
 # Makefile.L3
 set(USE_TRMM false)
 
-if (${ARCH} STREQUAL "arm" OR ${ARCH} STREQUAL "arm64" OR "${TARGET}" STREQUAL "LONGSOON3B" OR "${TARGET}" STREQUAL "GENERIC" OR "${CORE}" STREQUAL "generic" OR "${TARGET}" STREQUAL "HASWELL" OR "${CORE}" STREQUAL "haswell")
+if (${ARCH} STREQUAL "arm" OR ${ARCH} STREQUAL "arm64" OR "${TARGET}" STREQUAL "LONGSOON3B" OR "${TARGET}" STREQUAL "GENERIC" OR "${CORE}" STREQUAL "generic" OR "${TARGET}" STREQUAL "HASWELL" OR "${CORE}" STREQUAL "HASWELL")
   set(USE_TRMM true)
 endif ()
 

From 1b227daf14e296462755fde34fc3b5a228524ad4 Mon Sep 17 00:00:00 2001
From: liangkejin <liungkejin@gmail.com>
Date: Fri, 16 Dec 2016 20:52:07 +0800
Subject: [PATCH 2/3] fix error: non-void function 'get_feature' should return
 a value [-Wreturn-type]

---
 cpuid_arm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cpuid_arm.c b/cpuid_arm.c
index fe462c04a..2f8959242 100644
--- a/cpuid_arm.c
+++ b/cpuid_arm.c
@@ -74,7 +74,7 @@ int get_feature(char *search)
   	fclose(infile);
 
 
-	if( p == NULL ) return;
+	if( p == NULL ) return 0;
 
 	t = strtok(p," ");
 	while( t = strtok(NULL," "))

From eb67d9b5827211cf13bda270538a3dbbb19ab264 Mon Sep 17 00:00:00 2001
From: liangkejin <liungkejin@gmail.com>
Date: Fri, 16 Dec 2016 21:04:28 +0800
Subject: [PATCH 3/3] ignorecase false

---
 kernel/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/CMakeLists.txt b/kernel/CMakeLists.txt
index 435478c98..17c2b1b89 100644
--- a/kernel/CMakeLists.txt
+++ b/kernel/CMakeLists.txt
@@ -118,7 +118,7 @@ endforeach ()
 # Makefile.L3
 set(USE_TRMM false)
 
-if (${ARCH} STREQUAL "arm" OR ${ARCH} STREQUAL "arm64" OR "${TARGET}" STREQUAL "LONGSOON3B" OR "${TARGET}" STREQUAL "GENERIC" OR "${CORE}" STREQUAL "generic" OR "${TARGET}" STREQUAL "HASWELL" OR "${CORE}" STREQUAL "HASWELL")
+if (${ARCH} STREQUAL "arm" OR ${ARCH} STREQUAL "arm64" OR "${TARGET}" STREQUAL "LONGSOON3B" OR "${TARGET}" STREQUAL "GENERIC" OR "${CORE}" STREQUAL "generic" OR "${TARGET}" STREQUAL "HASWELL" OR "${CORE}" STREQUAL "haswell")
   set(USE_TRMM true)
 endif ()