[pkg-d-commits] [ldc] 44/95: Merge branch 'master' into merge-2.073

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.3.0-beta1
in repository ldc.

commit 97188a1a278ebd0f036f01b909743adebec55a29
Merge: 8db147a a75c84a
Author: Martin <noone at nowhere.com>
Date:   Thu Mar 9 01:11:03 2017 +0100

    Merge branch 'master' into merge-2.073
    
    Conflicts:
    	tests/d2/dmd-testsuite

 .travis.yml                                   |  3 ++
 ddmd/aggregate.d                              | 10 +---
 ddmd/target.d                                 |  7 ++-
 driver/cl_options.cpp                         |  5 +-
 driver/cl_options.h                           |  1 +
 driver/ldmd.cpp                               | 73 +++++++++++++--------------
 driver/linker.cpp                             | 55 +++++++++++---------
 driver/main.cpp                               |  2 +-
 runtime/CMakeLists.txt                        |  9 +++-
 runtime/profile-rt/DefineBuildProfileRT.cmake |  9 +---
 tests/codegen/simd_alignment.d                | 27 ++++++++++
 tests/d2/dmd-testsuite                        |  2 +-
 12 files changed, 116 insertions(+), 87 deletions(-)

diff --cc driver/cl_options.cpp
index 196cd26,2ec27bc..9cac488
--- a/driver/cl_options.cpp
+++ b/driver/cl_options.cpp
@@@ -321,15 -324,8 +324,15 @@@ cl::opt<std::string
           cl::Hidden, cl::init(""));
  #endif
  
 +static StringsAdapter
 +    modFileAliasStringsStore("mv", global.params.modFileAliasStrings);
 +static cl::list<std::string, StringsAdapter> modFileAliasStrings(
 +    "mv", cl::desc("Use <filespec> as source file for <package.module>"),
 +    cl::value_desc("<package.module>=<filespec>"),
 +    cl::location(modFileAliasStringsStore));
 +
  cl::opt<llvm::Reloc::Model> mRelocModel(
-     "relocation-model", cl::desc("Relocation model"),
+     "relocation-model", cl::desc("Relocation model"), cl::ZeroOrMore,
  #if LDC_LLVM_VER < 309
      cl::init(llvm::Reloc::Default),
  #endif
diff --cc driver/cl_options.h
index 78fad88,e604a94..aa76b0b
--- a/driver/cl_options.h
+++ b/driver/cl_options.h
@@@ -44,8 -44,9 +44,9 @@@ extern llvm::SmallVector<const char *, 
   */
  extern cl::list<std::string> fileList;
  extern cl::list<std::string> runargs;
+ extern cl::opt<bool> invokedByLDMD;
  extern cl::opt<bool> compileOnly;
 -extern cl::opt<bool, true> enforcePropertySyntax;
 +extern cl::opt<bool> useDIP1000;
  extern cl::opt<bool> noAsm;
  extern cl::opt<bool> dontWriteObj;
  extern cl::opt<std::string> objectFile;
diff --cc tests/d2/dmd-testsuite
index f14832d,ac06e5c..bdecaa5
--- a/tests/d2/dmd-testsuite
+++ b/tests/d2/dmd-testsuite
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f14832dd223d2f21007d44dfab17ebb5e38a56a5
 -Subproject commit ac06e5c249ea2dc963cbf285acda819593154da4
++Subproject commit bdecaa5d46c7c1cae28cde42eab8d0ded708118f

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git