D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-07-31 11:30:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	CMakeLists.txt
	druntime
	runtime/CMakeLists.txt
This commit is contained in:
David Nadlinger
2011-12-04 18:38:09 +01:00
parent fe19ee84f5 cd732537e8
commit 3916835380
26 changed files with 557 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dmd2/declaration.h
View File

@@ -361,6 +361,7 @@ struct VarDeclaration : Declaration
// debug description
llvm::DIVariable debugVariable;
llvm::DISubprogram debugFunc;
#endif
};

2
dmd2/mars.c
View File

@@ -103,7 +103,7 @@ Global::Global()
version = "v2.056";
#if IN_LLVM
ldc_version = "LDC trunk";
llvm_version = "LLVM 2.9";
llvm_version = "LLVM 3.0";
#endif
global.structalign = 8;