diff --git a/SGX_Linux/build.sh b/SGX_Linux/build.sh
index a04a3cae..f675ae84 100755
--- a/SGX_Linux/build.sh
+++ b/SGX_Linux/build.sh
@@ -6,9 +6,11 @@ if [ -z $1 ]; then
 fi
 
 # Build without assembly optimizations
+#make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1 clean
 #make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1
 
 # Build with assembly optimizations
+make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1 HAVE_WOLFSSL_ASSEMBLY=1 clean
 make SGX_MODE=HW SGX_PRERELEASE=1 SGX_WOLFSSL_LIB=${1}IDE/LINUX-SGX/ WOLFSSL_ROOT=${1} SGX_DEBUG=0 HAVE_WOLFSSL_TEST=1 HAVE_WOLFSSL_BENCHMARK=1 HAVE_WOLFSSL_SP=1 HAVE_WOLFSSL_ASSEMBLY=1
 
 exit 0
diff --git a/SGX_Linux/sgx_t.mk b/SGX_Linux/sgx_t.mk
index d8e8bc63..1334127c 100644
--- a/SGX_Linux/sgx_t.mk
+++ b/SGX_Linux/sgx_t.mk
@@ -64,11 +64,12 @@ endif
 ifeq ($(HAVE_WOLFSSL_ASSEMBLY), 1)
     Wolfssl_C_Extra_Flags += -DWOLFSSL_X86_64_BUILD\
 			     -DWOLFSSL_AESNI\
-			     -maes -masm=intel
+                 -maes -mavx -mavx2 -msse4.2
+
 #ifeq ($(HAVE_WOLFSSL_SP), 1)
-#    Wolfssl_C_Extra_Flags += -DWOLFSSL_SP_X86_64_ASM\
-#			     -DWOLFSSL_SP_X86_64\
-#			     -DWOLFSSL_SP_ASM
+    Wolfssl_C_Extra_Flags += -DWOLFSSL_SP_X86_64_ASM\
+			     -DWOLFSSL_SP_X86_64\
+			     -DWOLFSSL_SP_ASM
 #endif
 endif
 
diff --git a/SGX_Linux/sgx_u.mk b/SGX_Linux/sgx_u.mk
index 6077ea21..eb2c8dee 100644
--- a/SGX_Linux/sgx_u.mk
+++ b/SGX_Linux/sgx_u.mk
@@ -56,12 +56,13 @@ endif
 ifeq ($(HAVE_WOLFSSL_ASSEMBLY), 1)
     Wolfssl_C_Extra_Flags += -DWOLFSSL_X86_64_BUILD\
 			     -DWOLFSSL_AESNI\
-			     -maes -masm=intel
-#ifeq ($(HAVE_WOLFSSL_SP), 1)
-#    Wolfssl_C_Extra_Flags += -DWOLFSSL_SP_X86_64_ASM\
-#			     -DWOLFSSL_SP_X86_64\
-#			     -DWOLFSSL_SP_ASM
-#endif
+                 -maes -mavx -mavx2 -msse4.2
+
+ifeq ($(HAVE_WOLFSSL_SP), 1)
+    Wolfssl_C_Extra_Flags += -DWOLFSSL_SP_X86_64_ASM\
+			     -DWOLFSSL_SP_X86_64\
+			     -DWOLFSSL_SP_ASM
+endif
 endif
 
 ifeq ($(HAVE_WOLFSSL_SP), 1)