Changes in kernel/Makefile [a1e7e78:97186929] in mainline

File:

• kernel/Makefile (modified) (5 diffs)

kernel/Makefile

@@ -94 +94 @@
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
-        -std=gnu99 -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
+        -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
         -Werror-implicit-function-declaration -Wwrite-strings \
         -pipe
@@ -134 +134 @@
 #
 AFLAGS =
-LFLAGS = -n -T $(LINK) -M
+LFLAGS = -N -T $(LINK) -M
 
 #
@@ -228 +228 @@
         generic/src/syscall/syscall.c \
         generic/src/syscall/copy.c \
-        generic/src/mm/reserve.c \
         generic/src/mm/buddy.c \
         generic/src/mm/frame.c \
@@ -329 +328 @@
         endif
         
+        ifeq ($(CONFIG_FPU),y)
+                ifeq ($(KARCH),ia32)
+                        TEST_FPU1 = y
+                        TEST_SSE1 = y
+                        GENERIC_SOURCES += test/fpu/fpu1_x86.c
+                endif
+                
+                ifeq ($(KARCH),amd64)
+                        TEST_FPU1 = y
+                        TEST_SSE1 = y
+                        GENERIC_SOURCES += test/fpu/fpu1_x86.c
+                endif
+                
+                ifeq ($(KARCH),ia64)
+                        TEST_FPU1 = y
+                        GENERIC_SOURCES += test/fpu/fpu1_ia64.c
+                endif
+                
+                ifeq ($(KARCH),mips32)
+                        TEST_MIPS2 = y
+                endif
+        endif
+        
+        ifneq ($(TEST_FPU1),y)
+                GENERIC_SOURCES += test/fpu/fpu1_skip.c
+        endif
+        
+        ifeq ($(TEST_SSE1),y)
+                GENERIC_SOURCES += test/fpu/sse1.c
+        else
+                GENERIC_SOURCES += test/fpu/sse1_skip.c
+        endif
+        
+        ifeq ($(TEST_MIPS2),y)
+                GENERIC_SOURCES += test/fpu/mips2.c
+        else
+                GENERIC_SOURCES += test/fpu/mips2_skip.c
+        endif
+        
 endif
 
@@ -401 +439 @@
 endif
 
+#
+# The FPU tests are the only objects for which we allow the compiler to generate
+# FPU instructions.
+#
+
+test/fpu/%.o: test/fpu/%.c $(DEPEND)
+        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c -o $@ $<
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc test $(DEFS) $(CFLAGS) $(EXTRA_FLAGS)
+endif
+
+#
+# Ordinary objects.
+#
+
 %.o: %.c $(DEPEND)
         $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) $(if $(findstring $<,$(INSTRUMENTED_SOURCES)),$(INSTRUMENTATION)) -c -o $@ $<