Index: head/contrib/compiler-rt
===================================================================
--- head/contrib/compiler-rt	(revision 342122)
+++ head/contrib/compiler-rt	(revision 342123)

Property changes on: head/contrib/compiler-rt
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/compiler-rt/dist-release_70:r341746-342122
Index: head/contrib/libc++
===================================================================
--- head/contrib/libc++	(revision 342122)
+++ head/contrib/libc++	(revision 342123)

Property changes on: head/contrib/libc++
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/libc++/dist-release_70:r341746-342122
Index: head/contrib/llvm/tools/clang/lib/Basic/Version.cpp
===================================================================
--- head/contrib/llvm/tools/clang/lib/Basic/Version.cpp	(revision 342122)
+++ head/contrib/llvm/tools/clang/lib/Basic/Version.cpp	(revision 342123)
@@ -1,151 +1,151 @@
 //===- Version.cpp - Clang Version Number -----------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file defines several version-related utility functions for Clang.
 //
 //===----------------------------------------------------------------------===//
 
 #include "clang/Basic/Version.h"
 #include "clang/Basic/LLVM.h"
 #include "clang/Config/config.h"
 #include "llvm/Support/raw_ostream.h"
 #include <cstdlib>
 #include <cstring>
 
 #ifdef HAVE_SVN_VERSION_INC
 #  include "SVNVersion.inc"
 #endif
 
 namespace clang {
 
 std::string getClangRepositoryPath() {
 #if defined(CLANG_REPOSITORY_STRING)
   return CLANG_REPOSITORY_STRING;
 #else
 #ifdef SVN_REPOSITORY
   StringRef URL(SVN_REPOSITORY);
 #else
   StringRef URL("");
 #endif
 
   // 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/branches/release_70/lib/Basic/Version.cpp $");
+  StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_701/final/lib/Basic/Version.cpp $");
   if (URL.empty()) {
     URL = SVNRepository.slice(SVNRepository.find(':'),
                               SVNRepository.find("/lib/Basic"));
   }
 
   // Strip off version from a build from an integration branch.
   URL = URL.slice(0, URL.find("/src/tools/clang"));
 
   // Trim path prefix off, assuming path came from standard cfe path.
   size_t Start = URL.find("cfe/");
   if (Start != StringRef::npos)
     URL = URL.substr(Start + 4);
 
   return URL;
 #endif
 }
 
 std::string getLLVMRepositoryPath() {
 #ifdef LLVM_REPOSITORY
   StringRef URL(LLVM_REPOSITORY);
 #else
   StringRef URL("");
 #endif
 
   // Trim path prefix off, assuming path came from standard llvm path.
   // Leave "llvm/" prefix to distinguish the following llvm revision from the
   // clang revision.
   size_t Start = URL.find("llvm/");
   if (Start != StringRef::npos)
     URL = URL.substr(Start);
 
   return URL;
 }
 
 std::string getClangRevision() {
 #ifdef SVN_REVISION
   return SVN_REVISION;
 #else
   return "";
 #endif
 }
 
 std::string getLLVMRevision() {
 #ifdef LLVM_REVISION
   return LLVM_REVISION;
 #else
   return "";
 #endif
 }
 
 std::string getClangFullRepositoryVersion() {
   std::string buf;
   llvm::raw_string_ostream OS(buf);
   std::string Path = getClangRepositoryPath();
   std::string Revision = getClangRevision();
   if (!Path.empty() || !Revision.empty()) {
     OS << '(';
     if (!Path.empty())
       OS << Path;
     if (!Revision.empty()) {
       if (!Path.empty())
         OS << ' ';
       OS << Revision;
     }
     OS << ')';
   }
   // Support LLVM in a separate repository.
   std::string LLVMRev = getLLVMRevision();
   if (!LLVMRev.empty() && LLVMRev != Revision) {
     OS << " (";
     std::string LLVMRepo = getLLVMRepositoryPath();
     if (!LLVMRepo.empty())
       OS << LLVMRepo << ' ';
     OS << LLVMRev << ')';
   }
   return OS.str();
 }
 
 std::string getClangFullVersion() {
   return getClangToolFullVersion("clang");
 }
 
 std::string getClangToolFullVersion(StringRef ToolName) {
   std::string buf;
   llvm::raw_string_ostream OS(buf);
 #ifdef CLANG_VENDOR
   OS << CLANG_VENDOR;
 #endif
   OS << ToolName << " version " CLANG_VERSION_STRING " "
      << getClangFullRepositoryVersion();
 
   // If vendor supplied, include the base LLVM version as well.
 #ifdef CLANG_VENDOR
   OS << " (based on " << BACKEND_PACKAGE_STRING << ")";
 #endif
 
   return OS.str();
 }
 
 std::string getClangFullCPPVersion() {
   // The version string we report in __VERSION__ is just a compacted version of
   // the one we report on the command line.
   std::string buf;
   llvm::raw_string_ostream OS(buf);
 #ifdef CLANG_VENDOR
   OS << CLANG_VENDOR;
 #endif
   OS << "Clang " CLANG_VERSION_STRING " " << getClangFullRepositoryVersion();
   return OS.str();
 }
 
 } // end namespace clang
Index: head/contrib/llvm/tools/clang
===================================================================
--- head/contrib/llvm/tools/clang	(revision 342122)
+++ head/contrib/llvm/tools/clang	(revision 342123)

Property changes on: head/contrib/llvm/tools/clang
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/clang/dist-release_70:r341746-342122
Index: head/contrib/llvm/tools/lld
===================================================================
--- head/contrib/llvm/tools/lld	(revision 342122)
+++ head/contrib/llvm/tools/lld	(revision 342123)

Property changes on: head/contrib/llvm/tools/lld
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/lld/dist-release_70:r341746-342122
Index: head/contrib/llvm/tools/lldb
===================================================================
--- head/contrib/llvm/tools/lldb	(revision 342122)
+++ head/contrib/llvm/tools/lldb	(revision 342123)

Property changes on: head/contrib/llvm/tools/lldb
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/lldb/dist-release_70:r341746-342122
Index: head/contrib/llvm
===================================================================
--- head/contrib/llvm	(revision 342122)
+++ head/contrib/llvm	(revision 342123)

Property changes on: head/contrib/llvm
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /vendor/llvm/dist-release_70:r341746-342122
Index: head/lib/clang/include/clang/Basic/Version.inc
===================================================================
--- head/lib/clang/include/clang/Basic/Version.inc	(revision 342122)
+++ head/lib/clang/include/clang/Basic/Version.inc	(revision 342123)
@@ -1,11 +1,11 @@
 /* $FreeBSD$ */
 
 #define	CLANG_VERSION			7.0.1
 #define	CLANG_VERSION_STRING		"7.0.1"
 #define	CLANG_VERSION_MAJOR		7
 #define	CLANG_VERSION_MINOR		0
 #define	CLANG_VERSION_PATCHLEVEL	1
 
 #define	CLANG_VENDOR			"FreeBSD "
 
-#define	SVN_REVISION			"348686"
+#define	SVN_REVISION			"349250"
Index: head/lib/clang/include/lld/Common/Version.inc
===================================================================
--- head/lib/clang/include/lld/Common/Version.inc	(revision 342122)
+++ head/lib/clang/include/lld/Common/Version.inc	(revision 342123)
@@ -1,10 +1,10 @@
 // $FreeBSD$
 
 #define LLD_VERSION 7.0.1
 #define LLD_VERSION_STRING "7.0.1"
 #define LLD_VERSION_MAJOR 7
 #define LLD_VERSION_MINOR 0
 
 #define LLD_REPOSITORY_STRING "FreeBSD"
 // <Upstream revision at import>-<Local identifier in __FreeBSD_version style>
-#define LLD_REVISION_STRING "348686-1300001"
+#define LLD_REVISION_STRING "349250-1300001"
Index: head/lib/clang/include/llvm/Support/VCSRevision.h
===================================================================
--- head/lib/clang/include/llvm/Support/VCSRevision.h	(revision 342122)
+++ head/lib/clang/include/llvm/Support/VCSRevision.h	(revision 342123)
@@ -1,2 +1,2 @@
 /* $FreeBSD$ */
-#define LLVM_REVISION "svn-r348686"
+#define LLVM_REVISION "svn-r349250"