diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86
index bf9ec71c6b5..bef24e059e7 100644
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -8,11 +8,9 @@ CONFIG_NAME = linux-dri-x86
 # Unnecessary on x86, generally.
 PIC_FLAGS = 
 
+# Add -m32 to CFLAGS:
+ARCH_FLAGS = -m32
+
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 ASM_SOURCES = $(X86_SOURCES)
 
-# Add -m32 to CFLAGS
-CFLAGS   = -m32 $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-	$(ASM_FLAGS) -std=c99 -ffast-math 
-
-CXXFLAGS = -m32 $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)