Changeset 23cdc921 in mainline

Timestamp:

2008-06-20T17:20:19Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

46c1234

Parents:

abe6163

Message:

Introduce the notion of FPU_NO_CFLAGS and separate building of test/fpu
objects and building the rest of kernel objects. Now, amd64 and ia32 can
enable things such as SSE selectively for the test/fpu/*.

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• arch/amd64/Makefile.inc (modified) (1 diff)
• arch/ia32/Makefile.inc (modified) (5 diffs)

kernel/Makefile

@@ -394 +394 @@
         $(AS) $(AFLAGS) $< -o $@
 
+#
+# The FPU tests are the only objects for which we allow the compiler to generate
+# FPU instructions.
+#
+test/fpu/%.o: test/fpu/%.c
+        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@
+
+#
+# Ordinary objects.
+#
 %.o: %.c
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) -c $< -o $@
+        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_FLAGS) $(FPU_NO_CFLAGS) -c $< -o $@ 

kernel/arch/amd64/Makefile.inc

@@ -36 +36 @@
 TOOLCHAIN_DIR = /usr/local/amd64
 
+FPU_NO_CFLAGS = -mno-sse -mno-sse2
 CMN1 = -m64 -mcmodel=kernel -mno-red-zone -fno-unwind-tables
 GCC_CFLAGS += $(CMN1)

kernel/arch/ia32/Makefile.inc

@@ -47 +47 @@
 
 ifeq ($(MACHINE),athlon-xp)
-        CMN2 = -march=athlon-xp -mno-mmx -mno-sse -mno-3dnow
+        FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-3dnow
+        CMN2 = -march=athlon-xp
         GCC_CFLAGS += $(CMN2)
         ICC_CFLAGS += $(CMN2)
@@ -56 +57 @@
 endif
 ifeq ($(MACHINE),athlon-mp)
-        CMN2 = -march=athlon-mp -mno-mmx -mno-sse -mno-3dnow
+        FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-3dnow
+        CMN2 = -march=athlon-mp
         GCC_CFLAGS += $(CMN2)
         ICC_CFLAGS += $(CMN2)
@@ -64 +66 @@
 endif
 ifeq ($(MACHINE),pentium3)
-        CMN2 = -march=pentium3 -mno-mmx -mno-sse
+        FPU_NO_CFLAGS = -mno-mmx -mno-sse
+        CMN2 = -march=pentium3
         GCC_CFLAGS += $(CMN2)
         ICC_CFLAGS += $(CMN2)
@@ -72 +75 @@
 endif
 ifeq ($(MACHINE),core)
-        CMN2 = -march=prescott -mno-mmmx -mno-sse -mno-sse2 -mno-sse3
+        FPU_NO_CFLAGS = -mno-mmmx -mno-sse -mno-sse2 -mno-sse3
+        CMN2 = -march=prescott
         GCC_CFLAGS += $(CMN2)
         ICC_CFLAGS += $(CMN2)
@@ -79 +83 @@
 endif
 ifeq ($(MACHINE),pentium4)
-        GCC_CFLAGS += -march=pentium4 -mno-mmx -mno-sse -mno-sse2
+        FPU_NO_CFLAGS = -mno-mmx -mno-sse -mno-sse2
+        GCC_CFLAGS += -march=pentium4
         ICC_CFLAGS += -march=pentium4
         SUNCC_CFLAGS += -xarch=sse2