Changeset 41f7564 in mainline for kernel/arch/ia32

Timestamp:

2006-07-17T00:53:53Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

231fcb2

Parents:

41c4444

Message:

cleanup and unify the build system

File:

• kernel/arch/ia32/Makefile.inc (modified) (2 diffs)

kernel/arch/ia32/Makefile.inc

@@ -36 +36 @@
 TOOLCHAIN_DIR = /usr/local/i686/bin
 
-## Make some default assumptions
-#
-
-ifndef IA32_CPU
-        IA32_CPU = pentium4
-endif
-
-DEFS += -D_CPU=${IA32_CPU} -D__32_BITS__
+DEFS += -DMACHINE=$(MACHINE) -D__32_BITS__
 
 ## Accepted CPUs
 #
 
-ifeq ($(IA32_CPU),athlon-xp)
+ifeq ($(MACHINE),athlon-xp)
         CFLAGS += -march=athlon-xp -mmmx -msse -m3dnow
         DEFS += -DCONFIG_FENCES_P3
@@ -54 +47 @@
         CONFIG_HT = n
 endif
-ifeq ($(IA32_CPU),athlon-mp)
+ifeq ($(MACHINE),athlon-mp)
         CFLAGS += -march=athlon-mp -mmmx -msse -m3dnow
         DEFS += -DCONFIG_FENCES_P3
         CONFIG_HT = n
 endif
-ifeq ($(IA32_CPU),pentium3)
+ifeq ($(MACHINE),pentium3)
         CFLAGS += -march=pentium3 -mmmx -msse
         DEFS += -DCONFIG_FENCES_P3
         CONFIG_HT = n
 endif
-ifeq ($(IA32_CPU),prescott)
+ifeq ($(MACHINE),prescott)
         CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2 -msse3
         DEFS += -DCONFIG_FENCES_P4
 endif
-ifeq ($(IA32_CPU),pentium4)
+ifeq ($(MACHINE),pentium4)
         CFLAGS += -march=pentium4 -mfpmath=sse -mmmx -msse -msse2
         DEFS += -DCONFIG_FENCES_P4