svn commit: r279295 - in projects/clang360-import: contrib/llvm/include/llvm-c contrib/llvm/lib/Linker contrib/llvm/tools/clang/lib/Basic lib/clang/include/clang/Basic

[Dimitry Andric]

Author: dim
Date: Wed Feb 25 18:50:24 2015
New Revision: 279295
URL: https://svnweb.freebsd.org/changeset/base/279295

Log:
  Merge llvm 3.6.0 final from ^/vendor/llvm/dist, merge clang 3.6.0 final
  from ^/vendor/clang/dist, and resolve conflicts.

Modified:
  projects/clang360-import/contrib/llvm/include/llvm-c/Linker.h
  projects/clang360-import/contrib/llvm/lib/Linker/LinkModules.cpp
  projects/clang360-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/clang360-import/lib/clang/include/clang/Basic/Version.inc
Directory Properties:
  projects/clang360-import/contrib/llvm/   (props changed)
  projects/clang360-import/contrib/llvm/tools/clang/   (props changed)

Modified: projects/clang360-import/contrib/llvm/include/llvm-c/Linker.h
==============================================================================
--- projects/clang360-import/contrib/llvm/include/llvm-c/Linker.h	Wed Feb 25 18:27:53 2015	(r279294)
+++ projects/clang360-import/contrib/llvm/include/llvm-c/Linker.h	Wed Feb 25 18:50:24 2015	(r279295)
@@ -20,13 +20,21 @@
 extern "C" {
 #endif
 
+
+/* Note: LLVMLinkerPreserveSource has no effect. */
+typedef enum {
+  LLVMLinkerDestroySource = 0, /* Allow source module to be destroyed. */
+  LLVMLinkerPreserveSource = 1 /* Preserve the source module. */
+} LLVMLinkerMode;
+
+
 /* Links the source module into the destination module, taking ownership
  * of the source module away from the caller. Optionally returns a
  * human-readable description of any errors that occurred in linking.
  * OutMessage must be disposed with LLVMDisposeMessage. The return value
  * is true if an error occurred, false otherwise. */
 LLVMBool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src,
-                         unsigned Unused, char **OutMessage);
+                         LLVMLinkerMode Mode, char **OutMessage);
 
 #ifdef __cplusplus
 }

Modified: projects/clang360-import/contrib/llvm/lib/Linker/LinkModules.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/lib/Linker/LinkModules.cpp	Wed Feb 25 18:27:53 2015	(r279294)
+++ projects/clang360-import/contrib/llvm/lib/Linker/LinkModules.cpp	Wed Feb 25 18:50:24 2015	(r279295)
@@ -1749,7 +1749,7 @@ bool Linker::LinkModules(Module *Dest, M
 //===----------------------------------------------------------------------===//
 
 LLVMBool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src,
-                         unsigned Unused, char **OutMessages) {
+                         LLVMLinkerMode Mode, char **OutMessages) {
   Module *D = unwrap(Dest);
   std::string Message;
   raw_string_ostream Stream(Message);

Modified: projects/clang360-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp
==============================================================================
--- projects/clang360-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Wed Feb 25 18:27:53 2015	(r279294)
+++ projects/clang360-import/contrib/llvm/tools/clang/lib/Basic/Version.cpp	Wed Feb 25 18:50:24 2015	(r279295)
@@ -36,7 +36,7 @@ std::string getClangRepositoryPath() {
 
   // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us
   // pick up a tag in an SVN export, for example.
-  StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc4/lib/Basic/Version.cpp $");
+  StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/final/lib/Basic/Version.cpp $");
   if (URL.empty()) {
     URL = SVNRepository.slice(SVNRepository.find(':'),
                               SVNRepository.find("/lib/Basic"));

Modified: projects/clang360-import/lib/clang/include/clang/Basic/Version.inc
==============================================================================
--- projects/clang360-import/lib/clang/include/clang/Basic/Version.inc	Wed Feb 25 18:27:53 2015	(r279294)
+++ projects/clang360-import/lib/clang/include/clang/Basic/Version.inc	Wed Feb 25 18:50:24 2015	(r279295)
@@ -6,6 +6,6 @@
 #define	CLANG_VERSION_PATCHLEVEL	0
 
 #define	CLANG_VENDOR			"FreeBSD "
-#define	CLANG_VENDOR_SUFFIX		" 20150219"
+#define	CLANG_VENDOR_SUFFIX		" 20150225"
 
-#define	SVN_REVISION			"229772"
+#define	SVN_REVISION			"230434"