--- ./arch/um/Makefile.fix	2004-01-18 10:07:33.000000000 +0100
+++ ./arch/um/Makefile	2004-01-18 17:18:17.000000000 +0100
@@ -137,8 +137,21 @@
 # To get a definition of F_SETSIG
 USER_CFLAGS += -D_GNU_SOURCE
 
+#From main Makefile, these options are set after including the ARCH makefile.
+#So copy them here.
+
+ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
+USER_CFLAGS		+= -Os
+else
+USER_CFLAGS		+= -O2
+endif
+
+ifndef CONFIG_FRAME_POINTER
+USER_CFLAGS		+= -fomit-frame-pointer
+endif
+
 ifdef CONFIG_DEBUG_INFO
-USER_CFLAGS          += -g
+USER_CFLAGS		+= -g
 endif
 
 CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/uml.lds.s \