-CFLAGS = -g -MMD -msoft-float
-CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib
-ASFLAGS = -Wa,--gstabs -MMD
-LDFLAGS =
+CFLAGS = -g -msoft-float -O -march=i686
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I$(SRCDIR)/lib
+ASFLAGS = -Wa,--gstabs
+LDFLAGS = -z noseparate-code
+DEPS = -MMD -MF $(@:.o=.d)
+
+# Turn off -fstack-protector, which we don't support.
+ifeq ($(strip $(shell echo | $(CC) -fno-stack-protector -E - > /dev/null 2>&1; echo $$?)),0)
+CFLAGS += -fno-stack-protector
+endif
+
+# Turn off --build-id in the linker, which confuses the Pintos loader.
+ifeq ($(strip $(shell $(LD) --help | grep -q build-id; echo $$?)),0)
+LDFLAGS += -Wl,--build-id=none
+endif