From 780450bc364da413cde30b2cbf3b2d758c6cc098 Mon Sep 17 00:00:00 2001
From: Matthias Maennich <maennich@google.com>
Date: Wed, 23 Oct 2019 22:46:04 +0100
Subject: [PATCH] ANDROID: Revert "ANDROID: Removed check for asm-goto"

This reverts commit 7eb28048b00a3c1ee5cf29b6e416eaf61e79d705.

Change-Id: Ibb4775f9d11d5a5e413204855f8ccbcad6777b3d
Signed-off-by: Matthias Maennich <maennich@google.com>
---
 arch/x86/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 408bb5532d1b..94df0868804b 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -298,6 +298,10 @@ vdso_install:
 
 archprepare: checkbin
 checkbin:
+ifndef CONFIG_CC_HAS_ASM_GOTO
+	@echo Compiler lacks asm-goto support.
+	@exit 1
+endif
 ifdef CONFIG_RETPOLINE
 ifeq ($(RETPOLINE_CFLAGS),)
 	@echo "You are building kernel with non-retpoline compiler." >&2