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

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

Browse source
This commit is contained in:
Ivan 2017-11-01 22:24:27 +03:00
commit ae4db7d3b3
180 changed files with 15036 additions and 10675 deletions
Download patch file Download diff file Expand all files Collapse all files

34
driver/main.cpp
View file

@ -495,14 +495,18 @@ void parseCommandLine(int argc, char **argv, Strings &sourceFiles,
// we're looking for it anyway, and pre-setting the flag...
global.params.run = true;
if (!runargs.empty()) {
char const *name = runargs[0].c_str();
char const *ext = FileName::ext(name);
if (ext && FileName::equals(ext, "d") == 0 &&
FileName::equals(ext, "di") == 0) {
error(Loc(), "-run must be followed by a source file, not '%s'", name);
if (runargs[0] == "-") {
sourceFiles.push("__stdin.d");
} else {
char const *name = runargs[0].c_str();
char const *ext = FileName::ext(name);
if (ext && !FileName::equals(ext, "d") &&
!FileName::equals(ext, "di")) {
error(Loc(), "-run must be followed by a source file, not '%s'",
name);
}
sourceFiles.push(mem.xstrdup(name));
}
sourceFiles.push(mem.xstrdup(name));
runargs.erase(runargs.begin());
} else {
global.params.run = false;
@ -513,8 +517,12 @@ void parseCommandLine(int argc, char **argv, Strings &sourceFiles,
sourceFiles.reserve(fileList.size());
for (const auto &file : fileList) {
if (!file.empty()) {
char *copy = dupPathString(file);
sourceFiles.push(copy);
if (file == "-") {
sourceFiles.push("__stdin.d");
} else {
char *copy = dupPathString(file);
sourceFiles.push(copy);
}
}
}
@ -522,7 +530,7 @@ void parseCommandLine(int argc, char **argv, Strings &sourceFiles,
deprecation(Loc(), "-nodefaultlib is deprecated, as -defaultlib/-debuglib "
"now override the existing list instead of appending to "
"it. Please use the latter instead.");
} else {
} else if (!global.params.betterC) {
// Parse comma-separated default library list.
std::stringstream libNames(linkDebugLib ? debugLib : defaultLib);
while (libNames.good()) {
@ -796,6 +804,8 @@ void registerPredefinedTargetVersions() {
VersionCondition::addPredefinedGlobalIdent("D_SIMD");
if (traitsTargetHasFeature("avx"))
VersionCondition::addPredefinedGlobalIdent("D_AVX");
if (traitsTargetHasFeature("avx2"))
VersionCondition::addPredefinedGlobalIdent("D_AVX2");
}
*/
@ -916,6 +926,10 @@ void registerPredefinedVersions() {
VersionCondition::addPredefinedGlobalIdent("D_NoBoundsChecks");
}
if (global.params.betterC) {
VersionCondition::addPredefinedGlobalIdent("D_BetterC");
}
registerPredefinedTargetVersions();
// `D_ObjectiveC` is added by the ddmd.objc.Supported ctor