Merge remote-tracking branch 'origin/release/16.x' into openbsd-release/16.x

Author: mordak

libcxx/include/__config

@@ -38,7 +38,7 @@
 // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM.
 // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 16.0.1 == 16.00.01), _LIBCPP_VERSION is
 // defined to XXYYZZ.
-#  define _LIBCPP_VERSION 160005
+#  define _LIBCPP_VERSION 160006
 
 #  define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y
 #  define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y)

lld/test/wasm/Inputs/.gitattributes

@@ -0,0 +1,3 @@
+# ensures that we test parsing of stub libraries that contain
+# windows line endings
+libstub.so text eol=crlf

lld/wasm/Driver.cpp

@@ -281,7 +281,7 @@ void LinkerDriver::addFile(StringRef path) {
     files.push_back(createObjectFile(mbref));
     break;
   case file_magic::unknown:
-    if (mbref.getBuffer().starts_with("#STUB\n")) {
+    if (mbref.getBuffer().starts_with("#STUB")) {
       files.push_back(make<StubFile>(mbref));
       break;
     }

lld/wasm/InputFiles.cpp

@@ -691,12 +691,16 @@ StringRef strip(StringRef s) {
 }
 
 void StubFile::parse() {
-  bool first = false;
+  bool first = true;
+
+  SmallVector<StringRef> lines;
+  mb.getBuffer().split(lines, '\n');
+  for (StringRef line : lines) {
+    line = line.trim();
 
-  for (StringRef line : args::getLines(mb)) {
     // File must begin with #STUB
     if (first) {
-      assert(line == "#STUB\n");
+      assert(line == "#STUB");
       first = false;
     }
 
@@ -713,10 +717,10 @@ void StubFile::parse() {
     symbolDependencies[sym] = {};
 
     while (rest.size()) {
-      StringRef first;
-      std::tie(first, rest) = rest.split(',');
-      first = strip(first);
-      symbolDependencies[sym].push_back(first);
+      StringRef dep;
+      std::tie(dep, rest) = rest.split(',');
+      dep = strip(dep);
+      symbolDependencies[sym].push_back(dep);
     }
   }
 }

llvm/CMakeLists.txt

@@ -22,7 +22,7 @@ if(NOT DEFINED LLVM_VERSION_MINOR)
   set(LLVM_VERSION_MINOR 0)
 endif()
 if(NOT DEFINED LLVM_VERSION_PATCH)
-  set(LLVM_VERSION_PATCH 5)
+  set(LLVM_VERSION_PATCH 6)
 endif()
 if(NOT DEFINED LLVM_VERSION_SUFFIX)
   set(LLVM_VERSION_SUFFIX)

llvm/utils/gn/secondary/llvm/version.gni

@@ -1,4 +1,4 @@
 llvm_version_major = 16
 llvm_version_minor = 0
-llvm_version_patch = 5
+llvm_version_patch = 6
 llvm_version = "$llvm_version_major.$llvm_version_minor.$llvm_version_patch"

llvm/utils/lit/lit/__init__.py

@@ -2,7 +2,7 @@
 
 __author__ = 'Daniel Dunbar'
 __email__ = '[email protected]'
-__versioninfo__ = (16, 0, 5)
+__versioninfo__ = (16, 0, 6)
 __version__ = '.'.join(str(v) for v in __versioninfo__) + 'dev'
 
 __all__ = []