Merge remote-tracking branch 'AlexeyProkhin/master' into merge-3.0

Conflicts:
	CMakeLists.txt
	druntime
	runtime/CMakeLists.txt
This commit is contained in:
David Nadlinger
2011-12-04 18:38:09 +01:00
26 changed files with 557 additions and 394 deletions

View File

@@ -211,14 +211,11 @@ AsmStatement::toIR(IRState * irs)
IRAsmBlock* asmblock = irs->asmBlock;
assert(asmblock);
#ifndef DISABLE_DEBUG_INFO
// debug info
if (global.params.symdebug)
DtoDwarfStopPoint(loc.linnum);
#endif
DtoDwarfStopPoint(loc.linnum);
if (! asmcode)
return;
if (!asmcode)
return;
static std::string i_cns = "i";
static std::string p_cns = "i";