diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/commands.nim | 4 | ||||
| -rw-r--r-- | compiler/extccomp.nim | 49 | ||||
| -rw-r--r-- | compiler/msgs.nim | 4 |
3 files changed, 2 insertions, 55 deletions
diff --git a/compiler/commands.nim b/compiler/commands.nim index b75e953de..6fdca27fc 100644 --- a/compiler/commands.nim +++ b/compiler/commands.nim @@ -642,10 +642,6 @@ proc processSwitch(switch, arg: string, pass: TCmdLinePass, info: TLineInfo; of "experimental": expectNoArg(switch, arg, pass, info) gExperimentalMode = true - of "assembler": - cAssembler = nameToCC(arg) - if cAssembler notin cValidAssemblers: - localError(info, errGenerated, "'$1' is not a valid assembler." % [arg]) of "nocppexceptions": expectNoArg(switch, arg, pass, info) incl(gGlobalOptions, optNoCppExceptions) diff --git a/compiler/extccomp.nim b/compiler/extccomp.nim index dab643d50..70cd411fe 100644 --- a/compiler/extccomp.nim +++ b/compiler/extccomp.nim @@ -21,7 +21,7 @@ import type TSystemCC* = enum ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc, - ccTcc, ccPcc, ccUcc, ccIcl, asmFasm + ccTcc, ccPcc, ccUcc, ccIcl TInfoCCProp* = enum # properties of the C compiler: hasSwitchRange, # CC allows ranges in switch statements (GNU C) hasComputedGoto, # CC has computed goto (GNU C extension) @@ -320,31 +320,6 @@ compiler ucc: packedPragma: "", # XXX: not supported yet props: {}) -# fasm assembler -compiler fasm: - result = ( - name: "fasm", - objExt: "o", - optSpeed: "", - optSize: "", - compilerExe: "fasm", - cppCompiler: "fasm", - compileTmpl: "$file $objfile", - buildGui: "", - buildDll: "", - buildLib: "", - linkerExe: "", - linkTmpl: "", - includeCmd: "", - linkDirCmd: "", - linkLibCmd: "", - debug: "", - pic: "", - asmStmtFrmt: "", - structStmtFmt: "", - packedPragma: "", - props: {}) - const CC*: array[succ(low(TSystemCC))..high(TSystemCC), TInfoCC] = [ gcc(), @@ -358,22 +333,17 @@ const tcc(), pcc(), ucc(), - icl(), - fasm()] + icl()] hExt* = ".h" var cCompiler* = ccGcc # the used compiler - cAssembler* = ccNone gMixedMode*: bool # true if some module triggered C++ codegen cIncludes*: seq[string] = @[] # directories to search for included files cLibs*: seq[string] = @[] # directories to search for lib files cLinkedLibs*: seq[string] = @[] # libraries to link -const - cValidAssemblers* = {asmFasm} - # implementation proc libNameTmpl(): string {.inline.} = @@ -577,21 +547,6 @@ proc getLinkerExe(compiler: TSystemCC): string = proc getCompileCFileCmd*(cfile: Cfile): string = var c = cCompiler - if cfile.cname.endswith(".asm"): - var customAssembler = getConfigVar("assembler") - if customAssembler.len > 0: - c = nameToCC(customAssembler) - else: - if targetCPU == cpuI386 or targetCPU == cpuAmd64: - c = asmFasm - else: - c = ccNone - - if c == ccNone: - rawMessage(errExternalAssemblerNotFound, "") - elif c notin cValidAssemblers: - rawMessage(errExternalAssemblerNotValid, customAssembler) - var options = cFileSpecificOptions(cfile.cname) var exe = getConfigVar(c, ".exe") if exe.len == 0: exe = c.getCompilerExe(cfile.cname) diff --git a/compiler/msgs.nim b/compiler/msgs.nim index a1ba82263..0d30651bb 100644 --- a/compiler/msgs.nim +++ b/compiler/msgs.nim @@ -108,8 +108,6 @@ type errCannotInferReturnType, errGenericLambdaNotAllowed, errCompilerDoesntSupportTarget, - errExternalAssemblerNotFound, - errExternalAssemblerNotValid, errUser, warnCannotOpenFile, warnOctalEscape, warnXIsNeverRead, warnXmightNotBeenInit, @@ -372,8 +370,6 @@ const "it is used as an operand to another routine and the types " & "of the generic paramers can be inferred from the expected signature.", errCompilerDoesntSupportTarget: "The current compiler \'$1\' doesn't support the requested compilation target", - errExternalAssemblerNotFound: "External assembler not found", - errExternalAssemblerNotValid: "External assembler '$1' is not a valid assembler", errUser: "$1", warnCannotOpenFile: "cannot open \'$1\'", warnOctalEscape: "octal escape sequences do not exist; leading zero is ignored", |