mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-07 19:36:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/master' into runtime_compile_v5

Browse source
This commit is contained in:
Ivan 2017-10-23 21:53:27 +03:00
commit 31861621eb
19 changed files with 124 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

8
driver/codegenerator.cpp
View file

@ -26,10 +26,10 @@
#include "llvm/Support/YAMLTraits.h"
/// The module with the frontend-generated C main() definition.
extern Module *g_entrypointModule;
extern Module *entrypoint; // defined in ddmd/mars.d
/// The module that contains the actual D main() (_Dmain) definition.
extern Module *g_dMainModule;
extern Module *rootHasMain; // defined in ddmd/mars.d
#if LDC_LLVM_VER < 600
namespace llvm {
@ -316,8 +316,8 @@ void CodeGenerator::emit(Module *m) {
prepareLLModule(m);
codegenModule(ir_, m);
if (m == g_dMainModule) {
codegenModule(ir_, g_entrypointModule);
if (m == rootHasMain) {
codegenModule(ir_, entrypoint);
if (global.params.targetTriple->getEnvironment() == llvm::Triple::Android) {
// On Android, bracket TLS data with the symbols _tlsstart and _tlsend, as