:: commit 0c2381042730486efccdacd3c8b355e0f5eed5c5

diff --git a/common/common.mk b/common/common.mk
index 5fb5dca4..c932f8d3 100644
--- a/common/common.mk
+++ b/common/common.mk
@@ -74,6 +74,7 @@ ifeq ($(TARGET),bios)
         -fno-PIC \
         -m32 \
         -march=i686 \
+        -mabi=sysv \
         -mno-80387
     override CPPFLAGS_FOR_TARGET := \
         $(CPPFLAGS_FOR_TARGET) \
@@ -91,6 +92,7 @@ ifeq ($(TARGET),uefi-x86-64)
         -fshort-wchar \
         -m64 \
         -march=x86-64 \
+        -mabi=sysv \
         -mno-80387 \
         -mno-mmx \
         -mno-sse \
@@ -113,6 +115,7 @@ ifeq ($(TARGET),uefi-ia32)
         -fshort-wchar \
         -m32 \
         -march=i686 \
+        -mabi=sysv \
         -mno-80387
     override CPPFLAGS_FOR_TARGET := \
         -I ../nyu-efi/inc \
diff --git a/decompressor/decompressor.mk b/decompressor/decompressor.mk
index 920039ea..592d6834 100644
--- a/decompressor/decompressor.mk
+++ b/decompressor/decompressor.mk
@@ -29,6 +29,7 @@ override CFLAGS_FOR_TARGET += \
     -fno-PIC \
     -m32 \
     -march=i686 \
+    -mabi=sysv \
     -mno-80387
 
 override CPPFLAGS_FOR_TARGET := \
diff --git a/test/test.mk b/test/test.mk
index 84290bec..60d525ec 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -69,6 +69,7 @@ ifneq ($(findstring x86_64,$(shell $(CC_FOR_TARGET) -dumpmachine)),)
 override CFLAGS += \
     -m64 \
     -march=x86-64 \
+    -mabi=sysv \
     -mgeneral-regs-only \
     -mno-red-zone
 endif
@@ -105,6 +106,7 @@ override CFLAGS_MB := \
     -fno-PIC \
     -m32 \
     -march=i686 \
+    -mabi=sysv \
     -mgeneral-regs-only \
     -I. \
     -I../common/protos \