mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-02 16:11:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 2.078.0 front-end and stdlibs

Browse source
This commit is contained in:
Martin 2018-01-05 19:36:33 +01:00
parent f338b559ff
commit cfad799f48
203 changed files with 9174 additions and 8166 deletions
Download patch file Download diff file Expand all files Collapse all files

12
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 *entrypoint; // defined in ddmd/mars.d
extern Module *entrypoint; // defined in dmd/mars.d
/// The module that contains the actual D main() (_Dmain) definition.
extern Module *rootHasMain; // defined in ddmd/mars.d
extern Module *rootHasMain; // defined in dmd/mars.d
#if LDC_LLVM_VER < 600
namespace llvm {
@ -194,12 +194,11 @@ CodeGenerator::~CodeGenerator() {
if (singleObj_) {
// For singleObj builds, the first object file name is the one for the first
// source file (e.g., `b.o` for `ldc2 a.o b.d c.d`).
const char *filename = (*global.params.objfiles)[0];
const char *filename = global.params.objfiles[0];
// If there are bitcode files passed on the cmdline, add them after all
// other source files have been added to the (singleobj) module.
insertBitcodeFiles(ir_->module, ir_->context(),
*global.params.bitcodeFiles);
insertBitcodeFiles(ir_->module, ir_->context(), global.params.bitcodeFiles);
writeAndFreeLLModule(filename);
}
@ -240,8 +239,7 @@ void CodeGenerator::finishLLModule(Module *m) {
// Add bitcode files passed on the cmdline to
// the first module only, to avoid duplications.
if (moduleCount_ == 1) {
insertBitcodeFiles(ir_->module, ir_->context(),
*global.params.bitcodeFiles);
insertBitcodeFiles(ir_->module, ir_->context(), global.params.bitcodeFiles);
}
writeAndFreeLLModule(m->objfile->name->str);