Changeset 0773396 in mainline for HelenOS.config

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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

@@ -291 +291 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "icc" Intel C Compiler
 @ "clang" Clang
@@ -299 +300 @@
 @ "gcc_native" GNU C Compiler (native)
 @ "icc" Intel C Compiler
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 ! [PLATFORM=ia64] COMPILER (choice)
 
@@ -304 +306 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 ! [PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] COMPILER (choice)
 
@@ -309 +312 @@
 @ "gcc_cross" GNU C Compiler (cross-compiler)
 @ "gcc_native" GNU C Compiler (native)
+@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
 @ "clang" Clang
 ! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
@@ -319 +323 @@
 @ "ia32" Intel IA-32
 @ "mips32" MIPS 32-bit
-! [PLATFORM=abs32le&COMPILER=gcc_cross] CROSS_TARGET (choice)
+! [PLATFORM=abs32le&(COMPILER=gcc_cross|COMPILER=gcc_helenos)] CROSS_TARGET (choice)