Changeset 70554dd in mainline

Timestamp:

2009-02-20T15:50:36Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7aef7ee

Parents:

f32d90b

Message:

dash is not a safe character for C preprocessor, use underscore instead

Files:

• HelenOS.config (modified) (4 diffs)
• kernel/arch/ia32/Makefile.inc (modified) (1 diff)

HelenOS.config

@@ -61 +61 @@
 @ "pentium3" Pentium 3
 @ "core" Core Solo/Duo
-@ "athlon-xp" Athlon XP
-@ "athlon-mp" Athlon MP
+@ "athlon_xp" Athlon XP
+@ "athlon_mp" Athlon MP
 ! [PLATFORM=ia32] MACHINE (choice)
 
@@ -244 +244 @@
 
 % Fences
-! [PLATFORM=ia32&(MACHINE=athlon-xp|MACHINE=athlon-mp|MACHINE=pentium3)] CONFIG_FENCES_P3 (y)
+! [PLATFORM=ia32&(MACHINE=athlon_xp|MACHINE=athlon_mp|MACHINE=pentium3)] CONFIG_FENCES_P3 (y)
 
 % Fences
@@ -292 +292 @@
 
 % Support for SMP
-! [(PLATFORM=ia32&MACHINE!=athlon-xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_SMP (y/n)
+! [(PLATFORM=ia32&MACHINE!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_SMP (y/n)
 
 % Improved support for hyperthreading
@@ -298 +298 @@
 
 % Improved support for hyperthreading
-! [PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [PLATFORM=ia32&MACHINE!=athlon_xp&MACHINE!=athlon_mp&MACHINE!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
 
 % Lazy FPU context switching

kernel/arch/ia32/Makefile.inc

@@ -46 +46 @@
 #
 
-ifeq ($(MACHINE),athlon-xp)
+ifeq ($(MACHINE),athlon_xp)
         CMN2 = -march=athlon-xp
         SUNCC_CFLAGS += -xarch=ssea
 endif
-ifeq ($(MACHINE),athlon-mp)
+ifeq ($(MACHINE),athlon_mp)
         CMN2 = -march=athlon-mp
         SUNCC_CFLAGS += xarch=ssea