Changeset f6b5593 in mainline for HelenOS.config


Ignore:
Timestamp:
2009-09-21T11:53:03Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4098e38
Parents:
2f636b6 (diff), c1618ed (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:
1 edited

Legend:

Unmodified
Added
Removed
  • HelenOS.config

    r2f636b6 rf6b5593  
    219219
    220220% Compiler
    221 @ "gcc_cross" GCC Cross-compiler
    222 @ "gcc_native" GCC Native
    223 @ "icc_native" ICC Native
    224 @ "suncc_native" Sun Studio C Compiler
     221@ "gcc_cross" GNU C Compiler (cross-compiler)
     222@ "gcc_native" GNU C Compiler (native)
     223@ "icc" Intel C Compiler
     224@ "suncc" Sun Studio C Compiler
     225@ "clang" Clang
    225226! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
    226227
    227228% Compiler
    228 @ "gcc_cross" GCC Cross-compiler
    229 @ "gcc_native" GCC Native
    230 @ "icc_native" ICC Native
     229@ "gcc_cross" GNU C Compiler (cross-compiler)
     230@ "gcc_native" GNU C Compiler (native)
     231@ "icc" Intel C Compiler
    231232! [PLATFORM=ia64] COMPILER (choice)
    232233
    233234% Compiler
    234 @ "gcc_cross" GCC Cross-compiler
    235 @ "gcc_native" GCC Native
    236 @ "suncc_native" Sun Studio C Compiler
     235@ "gcc_cross" GNU C Compiler (cross-compiler)
     236@ "gcc_native" GNU C Compiler (native)
     237@ "suncc" Sun Studio C Compiler
    237238! [PLATFORM=sparc64] COMPILER (choice)
    238239
    239240% Compiler
    240 @ "gcc_cross" GCC Cross-compiler
    241 @ "gcc_native" GCC Native
     241@ "gcc_cross" GNU C Compiler (cross-compiler)
     242@ "gcc_native" GNU C Compiler (native)
    242243! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
    243244
Note: See TracChangeset for help on using the changeset viewer.