:: commit ab379629a5a4dfa30a912a1f04f4cf7bd1b4e7b2

diff --git a/common/GNUmakefile b/common/GNUmakefile
index ebd3b7e9..ce42509f 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -42,10 +42,6 @@ override CROSS_CFLAGS += \
     -fno-lto \
     -Wshadow \
     -Wvla \
-    -mno-80387 \
-    -mno-mmx \
-    -mno-sse \
-    -mno-sse2 \
     $(WERROR) \
     -MMD \
     -DCOM_OUTPUT=$(COM_OUTPUT) \
@@ -65,6 +61,7 @@ ifeq ($(TARGET),bios)
         -march=i686 \
         -mtune=generic \
         -mabi=sysv \
+        -mno-80387 \
         -Dbios=1 \
         -Duefi=0
 endif
@@ -78,6 +75,7 @@ ifeq ($(TARGET),uefi-x86-64)
         -march=i686 \
         -mtune=generic \
         -mabi=sysv \
+        -mno-80387 \
         -Dbios=0 \
         -Duefi=1 \
         -DGNU_EFI_USE_MS_ABI
@@ -88,6 +86,10 @@ ifeq ($(TARGET),uefi-x86-64)
         -march=x86-64 \
         -mtune=generic \
         -mabi=sysv \
+        -mno-80387 \
+        -mno-mmx \
+        -mno-sse \
+        -mno-sse2 \
         -mno-red-zone \
         -Dbios=0 \
         -Duefi=1 \
@@ -103,6 +105,7 @@ ifeq ($(TARGET),uefi-ia32)
         -march=i686 \
         -mtune=generic \
         -mabi=sysv \
+        -mno-80387 \
         -Dbios=0 \
         -Duefi=1 \
         -DGNU_EFI_USE_MS_ABI \