Changeset bfd7aac in mainline for HelenOS.config

Timestamp:

2010-02-17T19:19:08Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• HelenOS.config (modified) (5 diffs)

HelenOS.config

@@ -77 +77 @@
 @ "us" UltraSPARC I-II subarchitecture
 @ "us3" UltraSPARC III-IV subarchitecture
+@ "sun4v" Niagara (sun4v)
 ! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice)
 
@@ -257 +258 @@
 
 % Compiler
+@ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
 @ "clang" Clang
@@ -262 +264 @@
 
 
+## Cross-compiler target for abstract architecture
+
+% Cross-compiler target
+@ "arm32" ARM 32-bit
+@ "ia32" Intel IA-32
+@ "mips32" MIPS 32-bit
+! [PLATFORM=abs32le&COMPILER=gcc_cross] CROSS_TARGET (choice)
+
+
 ## Kernel configuration
 
@@ -283 +294 @@
 
 % Software integer division support
-! [PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
+! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
 
 % ASID support
@@ -445 +456 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
 
 % EGA support