diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index ad64608e2..d2bd682a2 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -25,7 +25,7 @@ HV_FILE := acrn
 CFLAGS += -Wall -W
 CFLAGS += -ffunction-sections -fdata-sections
 CFLAGS += -fshort-wchar -ffreestanding
-CFLAGS += -m64
+CFLAGS += -m64 -mno-mmx -mno-sse -mno-sse2 -mno-80387 -mno-fp-ret-in-387
 CFLAGS += -mno-red-zone
 CFLAGS += -static -nostdinc -nostdlib -fno-common
 CFLAGS += -O0 -D_FORTIFY_SOURCE=2
diff --git a/hypervisor/bsp/uefi/efi/Makefile b/hypervisor/bsp/uefi/efi/Makefile
index 520f01875..241870325 100644
--- a/hypervisor/bsp/uefi/efi/Makefile
+++ b/hypervisor/bsp/uefi/efi/Makefile
@@ -70,6 +70,8 @@ CFLAGS=-I. -I.. -I$(INCDIR)/efi -I$(INCDIR)/efi/$(ARCH) \
 		-DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \
 		-Wall -I../fs/ -D$(ARCH) -O0
 
+CFLAGS += -mno-mmx -mno-sse -mno-sse2 -mno-80387 -mno-fp-ret-in-387
+
 ifeq ($(ARCH),ia32)
 	ifeq ($(HOST),x86_64)
 		CFLAGS += -m32