From b0c3ef7de5ebee68ca997ba2aadcc56df5de7579 Mon Sep 17 00:00:00 2001
From: Pranav Bedre <bedrepranav@gmail.com>
Date: Thu, 1 Feb 2018 01:14:15 +0530
Subject: [PATCH] Makefile: Fix device not booting with GCC 7.x & above

---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index b03ca98f7a36..3829b6b38e09 100644
--- a/Makefile
+++ b/Makefile
@@ -624,6 +624,9 @@ endif
 # Tell gcc to never replace conditional load with a non-conditional one
 KBUILD_CFLAGS	+= $(call cc-option,--param=allow-store-data-races=0)
 
+# Needed to unbreak GCC 7.x and above
+KBUILD_CFLAGS   += $(call cc-option,-fno-store-merging,)
+
 ifdef CONFIG_READABLE_ASM
 # Disable optimizations that make assembler listings hard to read.
 # reorder blocks reorders the control in the function