From df71872f76f1cd938de66e7323d01d5c101a3554 Mon Sep 17 00:00:00 2001
From: "Tate, Hongliang Tian" <tate.thl@antfin.com>
Date: Wed, 15 Apr 2020 09:45:36 +0000
Subject: [PATCH] Disable Intel MPX by default

The next generation of Intel CPUs does not support Intel MPX. Enabling MPX
by default crashes the LibOS on startup. So we disable MPX by default. The
long term plan is to turn on/off MPX via compiling options.
---
 src/libos/src/entry.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libos/src/entry.rs b/src/libos/src/entry.rs
index 1b244cf0..541d1d9c 100644
--- a/src/libos/src/entry.rs
+++ b/src/libos/src/entry.rs
@@ -43,7 +43,7 @@ pub extern "C" fn occlum_ecall_init(log_level: *const c_char) -> i32 {
         // Init the log infrastructure first so that log messages will be printed afterwards
         util::log::init(log_level);
         // Init MPX for SFI
-        util::mpx_util::mpx_enable();
+        //util::mpx_util::mpx_enable();
         // Register exception handlers (support cpuid & rdtsc for now)
         register_exception_handlers();