Merge llvm 3.6.0 final from ^/vendor/llvm/dist, merge clang 3.6.0 final

from ^/vendor/clang/dist, and resolve conflicts.

1 files changed, 9 insertions, 1 deletions

diff --git a/contrib/llvm/include/llvm-c/Linker.h b/contrib/llvm/include/llvm-c/Linker.h
index cedde5e..a932c6d 100644
--- a/contrib/llvm/include/llvm-c/Linker.h
+++ b/contrib/llvm/include/llvm-c/Linker.h
@@ -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
 }