jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:Araq/Nimrod

Browse source
This commit is contained in:
Araq 2012-07-02 01:41:40 +02:00
commit dd97e00553
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/extccomp.nim
View file

@ -16,7 +16,7 @@ import
type type
TSystemCC* = enum TSystemCC* = enum
ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc, ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
ccTcc, ccPcc, ccUcc, ccIcc, ccGpp ccTcc, ccPcc, ccUcc, ccIcl, ccGpp
TInfoCCProp* = enum # properties of the C compiler: TInfoCCProp* = enum # properties of the C compiler:
hasSwitchRange, # CC allows ranges in switch statements (GNU C) hasSwitchRange, # CC allows ranges in switch statements (GNU C)
hasComputedGoto, # CC has computed goto (GNU C extension) hasComputedGoto, # CC has computed goto (GNU C extension)
@ -121,16 +121,16 @@ compiler vcc:
asmStmtFrmt: "__asm{$n$1$n}$n", asmStmtFrmt: "__asm{$n$1$n}$n",
props: {hasCpp, hasAssume}) props: {hasCpp, hasAssume})
compiler icc: compiler icl:
# Intel compilers try to imitate the native ones (gcc and msvc) # Intel compilers try to imitate the native ones (gcc and msvc)
when defined(windows): when defined(windows):
result = vcc() result = vcc()
else: else:
result = gcc() result = gcc()
result.name = "icc" result.name = "icl"
result.compilerExe = "icc" result.compilerExe = "icl"
result.linkerExe = "icc" result.linkerExe = "icl"
compiler lcc: compiler lcc:
result = ( result = (
@ -293,7 +293,7 @@ const
tcc(), tcc(),
pcc(), pcc(),
ucc(), ucc(),
icc(), icl(),
gpp()] gpp()]
const const

6
config/nimrod.cfg
View file

@ -74,8 +74,10 @@ hint[LineTooLong]=off
@end @end
# Configuration for the Intel C/C++ compiler: # Configuration for the Intel C/C++ compiler:
icc.options.always = "-cxxlib" @if windows:
icc.options.linker = "-cxxlib" icl.options.speed = "/Ox /arch:SSE2"
icl.options.always = "/nologo"
@end
# Configuration for the GNU C/C++ compiler: # Configuration for the GNU C/C++ compiler:
@if windows: @if windows: