From owner-svn-src-projects@FreeBSD.ORG Wed Feb 25 18:50:26 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B9FC710; Wed, 25 Feb 2015 18:50:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84BD261A; Wed, 25 Feb 2015 18:50:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PIoQ09063856; Wed, 25 Feb 2015 18:50:26 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PIoQIh063848; Wed, 25 Feb 2015 18:50:26 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502251850.t1PIoQIh063848@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 25 Feb 2015 18:50:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: 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 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2015 18:50:26 -0000 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"