From d11c97e8e2c4a661a3d0fd54d8b0402dfd6bbc0f Mon Sep 17 00:00:00 2001
From: Johann <johannkoenig@google.com>
Date: Wed, 29 Jun 2016 18:03:27 -0700
Subject: [PATCH] Require x86inc.asm

Force enable x86inc.asm when building for x86. Previously there were
compatibility issues so a flag was added to simplify disabling this
code.

The known issues have been resolved and x86inc.asm is the preferred
abstraction layer (over x86_abi_support.asm).

BUG=b:29583530

Change-Id: Ib935e97b37ffb22d7af72ba0f04564ae6280f1fd
---
 build/make/configure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/make/configure.sh b/build/make/configure.sh
index f2b8b37..aa66d9d 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1397,7 +1397,7 @@ EOF
   fi
 
   if [ "${tgt_isa}" = "x86_64" ] || [ "${tgt_isa}" = "x86" ]; then
-    soft_enable use_x86inc
+    enable_feature use_x86inc
   fi
 
   # Position Independent Code (PIC) support, for building relocatable
-- 
2.7.4