Changeset 055a68a in mainline for HelenOS.config


Ignore:
Timestamp:
2015-04-23T23:47:40Z (10 years ago)
Author:
Michal Koutný <xm.koutny+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a18a8b9
Parents:
acb8766e (diff), dcba819 (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

    racb8766e r055a68a  
    299299% Compiler
    300300@ "gcc_cross" GNU C Compiler (cross-compiler)
    301 @ "gcc_native" GNU C Compiler (native)
     301@ "clang" Clang
    302302@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
    303303@ "icc" Intel C Compiler
    304 @ "clang" Clang
     304@ "gcc_native" GNU C Compiler (native)
    305305! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
    306306
    307307% Compiler
    308308@ "gcc_cross" GNU C Compiler (cross-compiler)
     309@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
     310@ "icc" Intel C Compiler
    309311@ "gcc_native" GNU C Compiler (native)
    310 @ "icc" Intel C Compiler
    311 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
    312312! [PLATFORM=ia64] COMPILER (choice)
    313313
    314314% Compiler
    315315@ "gcc_cross" GNU C Compiler (cross-compiler)
     316@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
    316317@ "gcc_native" GNU C Compiler (native)
    317 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
    318 ! [PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
     318! [PLATFORM=sparc32] COMPILER (choice)
    319319
    320320% Compiler
    321321@ "gcc_cross" GNU C Compiler (cross-compiler)
     322@ "clang" Clang
     323@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
    322324@ "gcc_native" GNU C Compiler (native)
    323 @ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
    324 @ "clang" Clang
    325 ! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc32|PLATFORM=sparc64] COMPILER (choice)
     325! [PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
    326326
    327327
Note: See TracChangeset for help on using the changeset viewer.