Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release:

MFC r309142 (by emaste):

Add WITH_LLD_AS_LD build knob

If set it installs LLD as /usr/bin/ld.  LLD (as of version 3.9) is not
capable of linking the world and kernel, but can self-host and link many
substantial applications. GNU ld continues to be used for the world and
kernel build, regardless of how this knob is set.

It is on by default for arm64, and off for all other CPU architectures.

Sponsored by:	The FreeBSD Foundation

MFC r310840:

Reapply 310775, now it also builds correctly if lldb is disabled:

Move llvm-objdump from CLANG_EXTRAS to installed by default

We currently install three tools from binutils 2.17.50: as, ld, and
objdump. Work is underway to migrate to a permissively-licensed
tool-chain, with one goal being the retirement of binutils 2.17.50.

LLVM's llvm-objdump is intended to be compatible with GNU objdump
although it is currently missing some options and may have formatting
differences. Enable it by default for testing and further investigation.
It may later be changed to install as /usr/bin/objdump, it becomes a
fully viable replacement.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D8879

MFC r312855 (by emaste):

Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC

Reported by:	Dan McGregor <dan.mcgregor usask.ca>

MFC r313559 | glebius | 2017-02-10 18:34:48 +0100 (Fri, 10 Feb 2017) | 5 lines

Don't check struct rtentry on FreeBSD, it is an internal kernel structure.
On other systems it may be API structure for SIOCADDRT/SIOCDELRT.

Reviewed by:	emaste, dim

MFC r314152 (by jkim):

Remove an assembler flag, which is redundant since r309124.  The upstream
took care of it by introducing a macro NO_EXEC_STACK_DIRECTIVE.

http://llvm.org/viewvc/llvm-project?rev=273500&view=rev

Reviewed by:	dim

MFC r314564:

Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to
4.0.0 (branches/release_40 296509).  The release will follow soon.

Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11
support to build; see UPDATING for more information.

Also note that as of 4.0.0, lld should be able to link the base system
on amd64 and aarch64.  See the WITH_LLD_IS_LLD setting in src.conf(5).
Though please be aware that this is work in progress.

Release notes for llvm, clang and lld will be available here:
<http://releases.llvm.org/4.0.0/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/clang/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/lld/docs/ReleaseNotes.html>

Thanks to Ed Maste, Jan Beich, Antoine Brodin and Eric Fiselier for
their help.

Relnotes:	yes
Exp-run:	antoine
PR:		215969, 216008

MFC r314708:

For now, revert r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

This commit is the cause of excessive compile times on skein_block.c
(and possibly other files) during kernel builds on amd64.

We never saw the problematic behavior described in this upstream commit,
so for now it is better to revert it.  An upstream bug has been filed
here: https://bugs.llvm.org/show_bug.cgi?id=32142

Reported by:	mjg

MFC r314795:

Reapply r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

Pull in r296992 from upstream llvm trunk (by Sanjoy Das):

  [SCEV] Decrease the recursion threshold for CompareValueComplexity

  Fixes PR32142.

  r287232 accidentally increased the recursion threshold for
  CompareValueComplexity from 2 to 32.  This change reverses that
  change by introducing a separate flag for CompareValueComplexity's
  threshold.

The latter revision fixes the excessive compile times for skein_block.c.

MFC r314907 | mmel | 2017-03-08 12:40:27 +0100 (Wed, 08 Mar 2017) | 7 lines

Unbreak ARMv6 world.

The new compiler_rt library imported with clang 4.0.0 have several fatal
issues (non-functional __udivsi3 for example) with ARM specific instrict
functions. As temporary workaround, until upstream solve these problems,
disable all thumb[1][2] related feature.

MFC r315016:

Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release.
We were already very close to the last release candidate, so this is a
pretty minor update.

Relnotes:	yes

MFC r316005:

Revert r314907, and pull in r298713 from upstream compiler-rt trunk (by
Weiming Zhao):

  builtins: Select correct code fragments when compiling for Thumb1/Thum2/ARM ISA.

  Summary:
  Value of __ARM_ARCH_ISA_THUMB isn't based on the actual compilation
  mode (-mthumb, -marm), it reflect's capability of given CPU.

  Due to this:
   - use  __tbumb__ and __thumb2__ insteand of __ARM_ARCH_ISA_THUMB
   - use '.thumb' directive consistently  in all affected files
   - decorate all thumb functions using
     DEFINE_COMPILERRT_THUMB_FUNCTION()

  ---------
  Note: This patch doesn't fix broken Thumb1 variant of __udivsi3 !

  Reviewers: weimingz, rengolin, compnerd

  Subscribers: aemerson, dim

  Differential Revision: https://reviews.llvm.org/D30938

Discussed with:	mmel

1 files changed, 507 insertions, 460 deletions

diff --git a/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp b/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
index d2619af..dd13be9 100644
--- a/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
+++ b/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
@@ -16,505 +16,552 @@
 #include "Utility/StringExtractorGDBRemote.h"
 
 StringExtractorGDBRemote::ResponseType
-StringExtractorGDBRemote::GetResponseType () const
-{
-    if (m_packet.empty())
-        return eUnsupported;
+StringExtractorGDBRemote::GetResponseType() const {
+  if (m_packet.empty())
+    return eUnsupported;
+
+  switch (m_packet[0]) {
+  case 'E':
+    if (m_packet.size() == 3 && isxdigit(m_packet[1]) && isxdigit(m_packet[2]))
+      return eError;
+    break;
+
+  case 'O':
+    if (m_packet.size() == 2 && m_packet[1] == 'K')
+      return eOK;
+    break;
+
+  case '+':
+    if (m_packet.size() == 1)
+      return eAck;
+    break;
+
+  case '-':
+    if (m_packet.size() == 1)
+      return eNack;
+    break;
+  }
+  return eResponse;
+}
+
+StringExtractorGDBRemote::ServerPacketType
+StringExtractorGDBRemote::GetServerPacketType() const {
+#define PACKET_MATCHES(s)                                                      \
+  ((packet_size == (sizeof(s) - 1)) && (strcmp((packet_cstr), (s)) == 0))
+#define PACKET_STARTS_WITH(s)                                                  \
+  ((packet_size >= (sizeof(s) - 1)) &&                                         \
+   ::strncmp(packet_cstr, s, (sizeof(s) - 1)) == 0)
+
+  // Empty is not a supported packet...
+  if (m_packet.empty())
+    return eServerPacketType_invalid;
+
+  const size_t packet_size = m_packet.size();
+  const char *packet_cstr = m_packet.c_str();
+  switch (m_packet[0]) {
+
+  case '%':
+    return eServerPacketType_notify;
+
+  case '\x03':
+    if (packet_size == 1)
+      return eServerPacketType_interrupt;
+    break;
+
+  case '-':
+    if (packet_size == 1)
+      return eServerPacketType_nack;
+    break;
+
+  case '+':
+    if (packet_size == 1)
+      return eServerPacketType_ack;
+    break;
+
+  case 'A':
+    return eServerPacketType_A;
+
+  case 'Q':
 
-    switch (m_packet[0])
-    {
+    switch (packet_cstr[1]) {
     case 'E':
-        if (m_packet.size() == 3 &&
-            isxdigit(m_packet[1]) &&
-            isxdigit(m_packet[2]))
-            return eError;
-        break;
-
-    case 'O':
-        if (m_packet.size() == 2 && m_packet[1] == 'K')
-            return eOK;
-        break;
-
-    case '+':
-        if (m_packet.size() == 1)
-            return eAck;
-        break;
-
-    case '-':
-        if (m_packet.size() == 1)
-            return eNack;
-        break;
+      if (PACKET_STARTS_WITH("QEnvironment:"))
+        return eServerPacketType_QEnvironment;
+      if (PACKET_STARTS_WITH("QEnvironmentHexEncoded:"))
+        return eServerPacketType_QEnvironmentHexEncoded;
+      break;
+
+    case 'S':
+      if (PACKET_MATCHES("QStartNoAckMode"))
+        return eServerPacketType_QStartNoAckMode;
+      if (PACKET_STARTS_WITH("QSaveRegisterState"))
+        return eServerPacketType_QSaveRegisterState;
+      if (PACKET_STARTS_WITH("QSetDisableASLR:"))
+        return eServerPacketType_QSetDisableASLR;
+      if (PACKET_STARTS_WITH("QSetDetachOnError:"))
+        return eServerPacketType_QSetDetachOnError;
+      if (PACKET_STARTS_WITH("QSetSTDIN:"))
+        return eServerPacketType_QSetSTDIN;
+      if (PACKET_STARTS_WITH("QSetSTDOUT:"))
+        return eServerPacketType_QSetSTDOUT;
+      if (PACKET_STARTS_WITH("QSetSTDERR:"))
+        return eServerPacketType_QSetSTDERR;
+      if (PACKET_STARTS_WITH("QSetWorkingDir:"))
+        return eServerPacketType_QSetWorkingDir;
+      if (PACKET_STARTS_WITH("QSetLogging:"))
+        return eServerPacketType_QSetLogging;
+      if (PACKET_STARTS_WITH("QSetMaxPacketSize:"))
+        return eServerPacketType_QSetMaxPacketSize;
+      if (PACKET_STARTS_WITH("QSetMaxPayloadSize:"))
+        return eServerPacketType_QSetMaxPayloadSize;
+      if (PACKET_STARTS_WITH("QSetEnableAsyncProfiling;"))
+        return eServerPacketType_QSetEnableAsyncProfiling;
+      if (PACKET_STARTS_WITH("QSyncThreadState:"))
+        return eServerPacketType_QSyncThreadState;
+      break;
+
+    case 'L':
+      if (PACKET_STARTS_WITH("QLaunchArch:"))
+        return eServerPacketType_QLaunchArch;
+      if (PACKET_MATCHES("QListThreadsInStopReply"))
+        return eServerPacketType_QListThreadsInStopReply;
+      break;
+
+    case 'R':
+      if (PACKET_STARTS_WITH("QRestoreRegisterState:"))
+        return eServerPacketType_QRestoreRegisterState;
+      break;
+
+    case 'T':
+      if (PACKET_MATCHES("QThreadSuffixSupported"))
+        return eServerPacketType_QThreadSuffixSupported;
+      break;
     }
-    return eResponse;
-}
+    break;
+
+  case 'q':
+    switch (packet_cstr[1]) {
+    case 's':
+      if (PACKET_MATCHES("qsProcessInfo"))
+        return eServerPacketType_qsProcessInfo;
+      if (PACKET_MATCHES("qsThreadInfo"))
+        return eServerPacketType_qsThreadInfo;
+      break;
+
+    case 'f':
+      if (PACKET_STARTS_WITH("qfProcessInfo"))
+        return eServerPacketType_qfProcessInfo;
+      if (PACKET_STARTS_WITH("qfThreadInfo"))
+        return eServerPacketType_qfThreadInfo;
+      break;
+
+    case 'C':
+      if (packet_size == 2)
+        return eServerPacketType_qC;
+      break;
 
-StringExtractorGDBRemote::ServerPacketType
-StringExtractorGDBRemote::GetServerPacketType () const
-{
-#define PACKET_MATCHES(s) ((packet_size == (sizeof(s)-1)) && (strcmp((packet_cstr),(s)) == 0))
-#define PACKET_STARTS_WITH(s) ((packet_size >= (sizeof(s)-1)) && ::strncmp(packet_cstr, s, (sizeof(s)-1))==0)
-    
-    // Empty is not a supported packet...
-    if (m_packet.empty())
-        return eServerPacketType_invalid;
-
-    const size_t packet_size = m_packet.size();
-    const char *packet_cstr = m_packet.c_str();
-    switch (m_packet[0])
-    {
-
-    case '%':
-        return eServerPacketType_notify;
-
-    case '\x03':
-        if (packet_size == 1) return eServerPacketType_interrupt;
-        break;
-
-    case '-':
-        if (packet_size == 1) return eServerPacketType_nack;
-        break;
-
-    case '+':
-        if (packet_size == 1) return eServerPacketType_ack;
-        break;
-
-    case 'A':
-        return eServerPacketType_A;
+    case 'E':
+      if (PACKET_STARTS_WITH("qEcho:"))
+        return eServerPacketType_qEcho;
+      break;
+
+    case 'F':
+      if (PACKET_STARTS_WITH("qFileLoadAddress:"))
+        return eServerPacketType_qFileLoadAddress;
+      break;
+
+    case 'G':
+      if (PACKET_STARTS_WITH("qGroupName:"))
+        return eServerPacketType_qGroupName;
+      if (PACKET_MATCHES("qGetWorkingDir"))
+        return eServerPacketType_qGetWorkingDir;
+      if (PACKET_MATCHES("qGetPid"))
+        return eServerPacketType_qGetPid;
+      if (PACKET_STARTS_WITH("qGetProfileData;"))
+        return eServerPacketType_qGetProfileData;
+      if (PACKET_MATCHES("qGDBServerVersion"))
+        return eServerPacketType_qGDBServerVersion;
+      break;
+
+    case 'H':
+      if (PACKET_MATCHES("qHostInfo"))
+        return eServerPacketType_qHostInfo;
+      break;
+
+    case 'K':
+      if (PACKET_STARTS_WITH("qKillSpawnedProcess"))
+        return eServerPacketType_qKillSpawnedProcess;
+      break;
+
+    case 'L':
+      if (PACKET_STARTS_WITH("qLaunchGDBServer"))
+        return eServerPacketType_qLaunchGDBServer;
+      if (PACKET_MATCHES("qLaunchSuccess"))
+        return eServerPacketType_qLaunchSuccess;
+      break;
+
+    case 'M':
+      if (PACKET_STARTS_WITH("qMemoryRegionInfo:"))
+        return eServerPacketType_qMemoryRegionInfo;
+      if (PACKET_MATCHES("qMemoryRegionInfo"))
+        return eServerPacketType_qMemoryRegionInfoSupported;
+      if (PACKET_STARTS_WITH("qModuleInfo:"))
+        return eServerPacketType_qModuleInfo;
+      break;
+
+    case 'P':
+      if (PACKET_STARTS_WITH("qProcessInfoPID:"))
+        return eServerPacketType_qProcessInfoPID;
+      if (PACKET_STARTS_WITH("qPlatform_shell:"))
+        return eServerPacketType_qPlatform_shell;
+      if (PACKET_STARTS_WITH("qPlatform_mkdir:"))
+        return eServerPacketType_qPlatform_mkdir;
+      if (PACKET_STARTS_WITH("qPlatform_chmod:"))
+        return eServerPacketType_qPlatform_chmod;
+      if (PACKET_MATCHES("qProcessInfo"))
+        return eServerPacketType_qProcessInfo;
+      break;
 
     case 'Q':
-
-        switch (packet_cstr[1])
-        {
-        case 'E':
-            if (PACKET_STARTS_WITH ("QEnvironment:"))           return eServerPacketType_QEnvironment;
-            if (PACKET_STARTS_WITH ("QEnvironmentHexEncoded:")) return eServerPacketType_QEnvironmentHexEncoded;
-            break;
-
-        case 'S':
-            if (PACKET_MATCHES ("QStartNoAckMode"))               return eServerPacketType_QStartNoAckMode;
-            if (PACKET_STARTS_WITH ("QSaveRegisterState"))        return eServerPacketType_QSaveRegisterState;
-            if (PACKET_STARTS_WITH ("QSetDisableASLR:"))          return eServerPacketType_QSetDisableASLR;
-            if (PACKET_STARTS_WITH ("QSetDetachOnError:"))        return eServerPacketType_QSetDetachOnError;
-            if (PACKET_STARTS_WITH ("QSetSTDIN:"))                return eServerPacketType_QSetSTDIN;
-            if (PACKET_STARTS_WITH ("QSetSTDOUT:"))               return eServerPacketType_QSetSTDOUT;
-            if (PACKET_STARTS_WITH ("QSetSTDERR:"))               return eServerPacketType_QSetSTDERR;
-            if (PACKET_STARTS_WITH ("QSetWorkingDir:"))           return eServerPacketType_QSetWorkingDir;
-            if (PACKET_STARTS_WITH ("QSetLogging:"))              return eServerPacketType_QSetLogging;
-            if (PACKET_STARTS_WITH ("QSetMaxPacketSize:"))        return eServerPacketType_QSetMaxPacketSize;
-            if (PACKET_STARTS_WITH ("QSetMaxPayloadSize:"))       return eServerPacketType_QSetMaxPayloadSize;
-            if (PACKET_STARTS_WITH ("QSetEnableAsyncProfiling;")) return eServerPacketType_QSetEnableAsyncProfiling;
-            if (PACKET_STARTS_WITH ("QSyncThreadState:"))         return eServerPacketType_QSyncThreadState;
-            break;
-
-        case 'L':
-            if (PACKET_STARTS_WITH ("QLaunchArch:"))              return eServerPacketType_QLaunchArch;
-            if (PACKET_MATCHES("QListThreadsInStopReply"))        return eServerPacketType_QListThreadsInStopReply;
-            break;
-
-        case 'R':
-            if (PACKET_STARTS_WITH ("QRestoreRegisterState:"))    return eServerPacketType_QRestoreRegisterState;
-            break;
-
-        case 'T':
-            if (PACKET_MATCHES ("QThreadSuffixSupported"))        return eServerPacketType_QThreadSuffixSupported;
-            break;
-        }
-        break;
-
-    case 'q':
-        switch (packet_cstr[1])
-        {
-        case 's':
-            if (PACKET_MATCHES ("qsProcessInfo"))               return eServerPacketType_qsProcessInfo;
-            if (PACKET_MATCHES ("qsThreadInfo"))                return eServerPacketType_qsThreadInfo;
-            break;
-
-        case 'f':
-            if (PACKET_STARTS_WITH ("qfProcessInfo"))           return eServerPacketType_qfProcessInfo;
-            if (PACKET_STARTS_WITH ("qfThreadInfo"))            return eServerPacketType_qfThreadInfo;
-            break;
-
-        case 'C':
-            if (packet_size == 2)                               return eServerPacketType_qC;
-            break;
-
-        case 'E':
-            if (PACKET_STARTS_WITH ("qEcho:"))                  return eServerPacketType_qEcho;
-            break;
-
-        case 'F':
-            if (PACKET_STARTS_WITH ("qFileLoadAddress:"))       return eServerPacketType_qFileLoadAddress;
-            break;
-
-        case 'G':
-            if (PACKET_STARTS_WITH ("qGroupName:"))             return eServerPacketType_qGroupName;
-            if (PACKET_MATCHES ("qGetWorkingDir"))              return eServerPacketType_qGetWorkingDir;
-            if (PACKET_MATCHES ("qGetPid"))                     return eServerPacketType_qGetPid;
-            if (PACKET_STARTS_WITH ("qGetProfileData;"))        return eServerPacketType_qGetProfileData;
-            if (PACKET_MATCHES ("qGDBServerVersion"))           return eServerPacketType_qGDBServerVersion;
-            break;
-
-        case 'H':
-            if (PACKET_MATCHES ("qHostInfo"))                   return eServerPacketType_qHostInfo;
-            break;
-
-        case 'K':
-            if (PACKET_STARTS_WITH ("qKillSpawnedProcess"))     return eServerPacketType_qKillSpawnedProcess;
-            break;
-
-        case 'L':
-            if (PACKET_STARTS_WITH ("qLaunchGDBServer"))        return eServerPacketType_qLaunchGDBServer;
-            if (PACKET_MATCHES ("qLaunchSuccess"))              return eServerPacketType_qLaunchSuccess;
-            break;
-
-        case 'M':
-            if (PACKET_STARTS_WITH ("qMemoryRegionInfo:"))      return eServerPacketType_qMemoryRegionInfo;
-            if (PACKET_MATCHES ("qMemoryRegionInfo"))           return eServerPacketType_qMemoryRegionInfoSupported;
-            if (PACKET_STARTS_WITH ("qModuleInfo:"))             return eServerPacketType_qModuleInfo;
-            break;
-
-        case 'P':
-            if (PACKET_STARTS_WITH ("qProcessInfoPID:"))        return eServerPacketType_qProcessInfoPID;
-            if (PACKET_STARTS_WITH ("qPlatform_shell:"))        return eServerPacketType_qPlatform_shell;
-            if (PACKET_STARTS_WITH ("qPlatform_mkdir:"))        return eServerPacketType_qPlatform_mkdir;
-            if (PACKET_STARTS_WITH ("qPlatform_chmod:"))        return eServerPacketType_qPlatform_chmod;
-            if (PACKET_MATCHES ("qProcessInfo"))                return eServerPacketType_qProcessInfo;
-            break;
-        
-        case 'Q':
-            if (PACKET_MATCHES ("qQueryGDBServer"))             return eServerPacketType_qQueryGDBServer;
-            break;
-
-        case 'R':
-            if (PACKET_STARTS_WITH ("qRcmd,"))                  return eServerPacketType_qRcmd;
-            if (PACKET_STARTS_WITH ("qRegisterInfo"))           return eServerPacketType_qRegisterInfo;
-            break;
-
-        case 'S':
-            if (PACKET_STARTS_WITH ("qSpeedTest:"))             return eServerPacketType_qSpeedTest;
-            if (PACKET_MATCHES ("qShlibInfoAddr"))              return eServerPacketType_qShlibInfoAddr;
-            if (PACKET_MATCHES ("qStepPacketSupported"))        return eServerPacketType_qStepPacketSupported;
-            if (PACKET_STARTS_WITH ("qSupported"))              return eServerPacketType_qSupported;
-            if (PACKET_MATCHES ("qSyncThreadStateSupported"))   return eServerPacketType_qSyncThreadStateSupported;
-            break;
-
-        case 'T':
-            if (PACKET_STARTS_WITH ("qThreadExtraInfo,"))       return eServerPacketType_qThreadExtraInfo;
-            if (PACKET_STARTS_WITH ("qThreadStopInfo"))         return eServerPacketType_qThreadStopInfo;
-            break;
-
-        case 'U':
-            if (PACKET_STARTS_WITH ("qUserName:"))              return eServerPacketType_qUserName;
-            break;
-
-        case 'V':
-            if (PACKET_MATCHES ("qVAttachOrWaitSupported"))     return eServerPacketType_qVAttachOrWaitSupported;
-            break;
-
-        case 'W':
-            if (PACKET_STARTS_WITH ("qWatchpointSupportInfo:")) return eServerPacketType_qWatchpointSupportInfo;
-            if (PACKET_MATCHES ("qWatchpointSupportInfo"))      return eServerPacketType_qWatchpointSupportInfoSupported;
-            break;
-
-        case 'X':
-            if (PACKET_STARTS_WITH ("qXfer:auxv:read::"))       return eServerPacketType_qXfer_auxv_read;
-            break;
-        }
-        break;
-
-    case 'j':
-        if (PACKET_MATCHES("jSignalsInfo"))                     return eServerPacketType_jSignalsInfo;
-        if (PACKET_MATCHES("jThreadsInfo"))                     return eServerPacketType_jThreadsInfo;
-        break;
-
-    case 'v':
-            if (PACKET_STARTS_WITH("vFile:"))
-            {
-                if (PACKET_STARTS_WITH("vFile:open:"))          return eServerPacketType_vFile_open;
-                else if (PACKET_STARTS_WITH("vFile:close:"))    return eServerPacketType_vFile_close;
-                else if (PACKET_STARTS_WITH("vFile:pread"))     return eServerPacketType_vFile_pread;
-                else if (PACKET_STARTS_WITH("vFile:pwrite"))    return eServerPacketType_vFile_pwrite;
-                else if (PACKET_STARTS_WITH("vFile:size"))      return eServerPacketType_vFile_size;
-                else if (PACKET_STARTS_WITH("vFile:exists"))    return eServerPacketType_vFile_exists;
-                else if (PACKET_STARTS_WITH("vFile:stat"))      return eServerPacketType_vFile_stat;
-                else if (PACKET_STARTS_WITH("vFile:mode"))      return eServerPacketType_vFile_mode;
-                else if (PACKET_STARTS_WITH("vFile:MD5"))       return eServerPacketType_vFile_md5;
-                else if (PACKET_STARTS_WITH("vFile:symlink"))   return eServerPacketType_vFile_symlink;
-                else if (PACKET_STARTS_WITH("vFile:unlink"))    return eServerPacketType_vFile_unlink;
-
-            } else {
-              if (PACKET_STARTS_WITH ("vAttach;"))              return eServerPacketType_vAttach;
-              if (PACKET_STARTS_WITH ("vAttachWait;"))          return eServerPacketType_vAttachWait;
-              if (PACKET_STARTS_WITH ("vAttachOrWait;"))        return eServerPacketType_vAttachOrWait;
-              if (PACKET_STARTS_WITH ("vAttachName;"))          return eServerPacketType_vAttachName;
-              if (PACKET_STARTS_WITH("vCont;"))                 return eServerPacketType_vCont;
-              if (PACKET_MATCHES ("vCont?"))                    return eServerPacketType_vCont_actions;
-            }
-            break;
-      case '_':
-        switch (packet_cstr[1])
-        {
-        case 'M':
-            return eServerPacketType__M;
-
-        case 'm':
-            return eServerPacketType__m;
-        }
-        break;
-
-      case '?':
-        if (packet_size == 1) return eServerPacketType_stop_reason;
-        break;
-
-      case 'c':
-        return eServerPacketType_c;
-
-      case 'C':
-        return eServerPacketType_C;
-
-      case 'D':
-        if (packet_size == 1) return eServerPacketType_D;
-        break;
-
-      case 'g':
-        if (packet_size == 1) return eServerPacketType_g;
-        break;
-
-      case 'G':
-        return eServerPacketType_G;
-
-      case 'H':
-        return eServerPacketType_H;
-
-      case 'I':
-        return eServerPacketType_I;
-
-      case 'k':
-        if (packet_size == 1) return eServerPacketType_k;
-        break;
-
-      case 'm':
-        return eServerPacketType_m;
-
-      case 'M':
-        return eServerPacketType_M;
-
-      case 'p':
-        return eServerPacketType_p;
-
-      case 'P':
-        return eServerPacketType_P;
-
-      case 's':
-        if (packet_size == 1) return eServerPacketType_s;
-        break;
-
-      case 'S':
-        return eServerPacketType_S;
-
-      case 'x':
-        return eServerPacketType_x;
-
-      case 'X':
-        return eServerPacketType_X;
-
-      case 'T':
-        return eServerPacketType_T;
-
-      case 'z':
-        if (packet_cstr[1] >= '0' && packet_cstr[1] <= '4')
-          return eServerPacketType_z;
-        break;
-
-      case 'Z':
-        if (packet_cstr[1] >= '0' && packet_cstr[1] <= '4')
-          return eServerPacketType_Z;
-        break;
+      if (PACKET_MATCHES("qQueryGDBServer"))
+        return eServerPacketType_qQueryGDBServer;
+      break;
+
+    case 'R':
+      if (PACKET_STARTS_WITH("qRcmd,"))
+        return eServerPacketType_qRcmd;
+      if (PACKET_STARTS_WITH("qRegisterInfo"))
+        return eServerPacketType_qRegisterInfo;
+      break;
+
+    case 'S':
+      if (PACKET_STARTS_WITH("qSpeedTest:"))
+        return eServerPacketType_qSpeedTest;
+      if (PACKET_MATCHES("qShlibInfoAddr"))
+        return eServerPacketType_qShlibInfoAddr;
+      if (PACKET_MATCHES("qStepPacketSupported"))
+        return eServerPacketType_qStepPacketSupported;
+      if (PACKET_STARTS_WITH("qSupported"))
+        return eServerPacketType_qSupported;
+      if (PACKET_MATCHES("qSyncThreadStateSupported"))
+        return eServerPacketType_qSyncThreadStateSupported;
+      break;
+
+    case 'T':
+      if (PACKET_STARTS_WITH("qThreadExtraInfo,"))
+        return eServerPacketType_qThreadExtraInfo;
+      if (PACKET_STARTS_WITH("qThreadStopInfo"))
+        return eServerPacketType_qThreadStopInfo;
+      break;
+
+    case 'U':
+      if (PACKET_STARTS_WITH("qUserName:"))
+        return eServerPacketType_qUserName;
+      break;
+
+    case 'V':
+      if (PACKET_MATCHES("qVAttachOrWaitSupported"))
+        return eServerPacketType_qVAttachOrWaitSupported;
+      break;
+
+    case 'W':
+      if (PACKET_STARTS_WITH("qWatchpointSupportInfo:"))
+        return eServerPacketType_qWatchpointSupportInfo;
+      if (PACKET_MATCHES("qWatchpointSupportInfo"))
+        return eServerPacketType_qWatchpointSupportInfoSupported;
+      break;
+
+    case 'X':
+      if (PACKET_STARTS_WITH("qXfer:auxv:read::"))
+        return eServerPacketType_qXfer_auxv_read;
+      break;
     }
-    return eServerPacketType_unimplemented;
-}
+    break;
+
+  case 'j':
+    if (PACKET_STARTS_WITH("jModulesInfo:"))
+      return eServerPacketType_jModulesInfo;
+    if (PACKET_MATCHES("jSignalsInfo"))
+      return eServerPacketType_jSignalsInfo;
+    if (PACKET_MATCHES("jThreadsInfo"))
+      return eServerPacketType_jThreadsInfo;
+    break;
+
+  case 'v':
+    if (PACKET_STARTS_WITH("vFile:")) {
+      if (PACKET_STARTS_WITH("vFile:open:"))
+        return eServerPacketType_vFile_open;
+      else if (PACKET_STARTS_WITH("vFile:close:"))
+        return eServerPacketType_vFile_close;
+      else if (PACKET_STARTS_WITH("vFile:pread"))
+        return eServerPacketType_vFile_pread;
+      else if (PACKET_STARTS_WITH("vFile:pwrite"))
+        return eServerPacketType_vFile_pwrite;
+      else if (PACKET_STARTS_WITH("vFile:size"))
+        return eServerPacketType_vFile_size;
+      else if (PACKET_STARTS_WITH("vFile:exists"))
+        return eServerPacketType_vFile_exists;
+      else if (PACKET_STARTS_WITH("vFile:stat"))
+        return eServerPacketType_vFile_stat;
+      else if (PACKET_STARTS_WITH("vFile:mode"))
+        return eServerPacketType_vFile_mode;
+      else if (PACKET_STARTS_WITH("vFile:MD5"))
+        return eServerPacketType_vFile_md5;
+      else if (PACKET_STARTS_WITH("vFile:symlink"))
+        return eServerPacketType_vFile_symlink;
+      else if (PACKET_STARTS_WITH("vFile:unlink"))
+        return eServerPacketType_vFile_unlink;
+
+    } else {
+      if (PACKET_STARTS_WITH("vAttach;"))
+        return eServerPacketType_vAttach;
+      if (PACKET_STARTS_WITH("vAttachWait;"))
+        return eServerPacketType_vAttachWait;
+      if (PACKET_STARTS_WITH("vAttachOrWait;"))
+        return eServerPacketType_vAttachOrWait;
+      if (PACKET_STARTS_WITH("vAttachName;"))
+        return eServerPacketType_vAttachName;
+      if (PACKET_STARTS_WITH("vCont;"))
+        return eServerPacketType_vCont;
+      if (PACKET_MATCHES("vCont?"))
+        return eServerPacketType_vCont_actions;
+    }
+    break;
+  case '_':
+    switch (packet_cstr[1]) {
+    case 'M':
+      return eServerPacketType__M;
+
+    case 'm':
+      return eServerPacketType__m;
+    }
+    break;
+
+  case '?':
+    if (packet_size == 1)
+      return eServerPacketType_stop_reason;
+    break;
+
+  case 'c':
+    return eServerPacketType_c;
+
+  case 'C':
+    return eServerPacketType_C;
+
+  case 'D':
+    if (packet_size == 1)
+      return eServerPacketType_D;
+    break;
 
-bool
-StringExtractorGDBRemote::IsOKResponse() const
-{
-    return GetResponseType () == eOK;
+  case 'g':
+    if (packet_size == 1)
+      return eServerPacketType_g;
+    break;
+
+  case 'G':
+    return eServerPacketType_G;
+
+  case 'H':
+    return eServerPacketType_H;
+
+  case 'I':
+    return eServerPacketType_I;
+
+  case 'k':
+    if (packet_size == 1)
+      return eServerPacketType_k;
+    break;
+
+  case 'm':
+    return eServerPacketType_m;
+
+  case 'M':
+    return eServerPacketType_M;
+
+  case 'p':
+    return eServerPacketType_p;
+
+  case 'P':
+    return eServerPacketType_P;
+
+  case 's':
+    if (packet_size == 1)
+      return eServerPacketType_s;
+    break;
+
+  case 'S':
+    return eServerPacketType_S;
+
+  case 'x':
+    return eServerPacketType_x;
+
+  case 'X':
+    return eServerPacketType_X;
+
+  case 'T':
+    return eServerPacketType_T;
+
+  case 'z':
+    if (packet_cstr[1] >= '0' && packet_cstr[1] <= '4')
+      return eServerPacketType_z;
+    break;
+
+  case 'Z':
+    if (packet_cstr[1] >= '0' && packet_cstr[1] <= '4')
+      return eServerPacketType_Z;
+    break;
+  }
+  return eServerPacketType_unimplemented;
 }
 
+bool StringExtractorGDBRemote::IsOKResponse() const {
+  return GetResponseType() == eOK;
+}
 
-bool
-StringExtractorGDBRemote::IsUnsupportedResponse() const
-{
-    return GetResponseType () == eUnsupported;
+bool StringExtractorGDBRemote::IsUnsupportedResponse() const {
+  return GetResponseType() == eUnsupported;
 }
 
-bool
-StringExtractorGDBRemote::IsNormalResponse() const
-{
-    return GetResponseType () == eResponse;
+bool StringExtractorGDBRemote::IsNormalResponse() const {
+  return GetResponseType() == eResponse;
 }
 
-bool
-StringExtractorGDBRemote::IsErrorResponse() const
-{
-    return GetResponseType () == eError &&
-           m_packet.size() == 3 &&
-           isxdigit(m_packet[1]) &&
-           isxdigit(m_packet[2]);
+bool StringExtractorGDBRemote::IsErrorResponse() const {
+  return GetResponseType() == eError && m_packet.size() == 3 &&
+         isxdigit(m_packet[1]) && isxdigit(m_packet[2]);
 }
 
-uint8_t
-StringExtractorGDBRemote::GetError ()
-{
-    if (GetResponseType() == eError)
-    {
-        SetFilePos(1);
-        return GetHexU8(255);
-    }
-    return 0;
+uint8_t StringExtractorGDBRemote::GetError() {
+  if (GetResponseType() == eError) {
+    SetFilePos(1);
+    return GetHexU8(255);
+  }
+  return 0;
 }
 
-size_t
-StringExtractorGDBRemote::GetEscapedBinaryData (std::string &str)
-{
-    // Just get the data bytes in the string as GDBRemoteCommunication::CheckForPacket()
-    // already removes any 0x7d escaped characters. If any 0x7d characters are left in
-    // the packet, then they are supposed to be there...
-    str.clear();
-    const size_t bytes_left = GetBytesLeft();
-    if (bytes_left > 0)
-    {
-        str.assign(m_packet, m_index, bytes_left);
-        m_index += bytes_left;
-    }
-    return str.size();
+size_t StringExtractorGDBRemote::GetEscapedBinaryData(std::string &str) {
+  // Just get the data bytes in the string as
+  // GDBRemoteCommunication::CheckForPacket()
+  // already removes any 0x7d escaped characters. If any 0x7d characters are
+  // left in
+  // the packet, then they are supposed to be there...
+  str.clear();
+  const size_t bytes_left = GetBytesLeft();
+  if (bytes_left > 0) {
+    str.assign(m_packet, m_index, bytes_left);
+    m_index += bytes_left;
+  }
+  return str.size();
 }
 
 static bool
-OKErrorNotSupportedResponseValidator(void *, const StringExtractorGDBRemote &response)
-{
-    switch (response.GetResponseType())
-    {
-        case StringExtractorGDBRemote::eOK:
-        case StringExtractorGDBRemote::eError:
-        case StringExtractorGDBRemote::eUnsupported:
-            return true;
-
-        case StringExtractorGDBRemote::eAck:
-        case StringExtractorGDBRemote::eNack:
-        case StringExtractorGDBRemote::eResponse:
-            break;
-    }
-    return false;
+OKErrorNotSupportedResponseValidator(void *,
+                                     const StringExtractorGDBRemote &response) {
+  switch (response.GetResponseType()) {
+  case StringExtractorGDBRemote::eOK:
+  case StringExtractorGDBRemote::eError:
+  case StringExtractorGDBRemote::eUnsupported:
+    return true;
+
+  case StringExtractorGDBRemote::eAck:
+  case StringExtractorGDBRemote::eNack:
+  case StringExtractorGDBRemote::eResponse:
+    break;
+  }
+  return false;
 }
 
-static bool
-JSONResponseValidator(void *, const StringExtractorGDBRemote &response)
-{
-    switch (response.GetResponseType())
-    {
-        case StringExtractorGDBRemote::eUnsupported:
-        case StringExtractorGDBRemote::eError:
-            return true; // Accept unsupported or EXX as valid responses
-
-        case StringExtractorGDBRemote::eOK:
-        case StringExtractorGDBRemote::eAck:
-        case StringExtractorGDBRemote::eNack:
-            break;
-
-        case StringExtractorGDBRemote::eResponse:
-            // JSON that is returned in from JSON query packets is currently always
-            // either a dictionary which starts with a '{', or an array which
-            // starts with a '['. This is a quick validator to just make sure the
-            // response could be valid JSON without having to validate all of the
-            // JSON content.
-            switch (response.GetStringRef()[0])
-            {
-                case '{': return true;
-                case '[': return true;
-                default:
-                    break;
-            }
-            break;
+static bool JSONResponseValidator(void *,
+                                  const StringExtractorGDBRemote &response) {
+  switch (response.GetResponseType()) {
+  case StringExtractorGDBRemote::eUnsupported:
+  case StringExtractorGDBRemote::eError:
+    return true; // Accept unsupported or EXX as valid responses
+
+  case StringExtractorGDBRemote::eOK:
+  case StringExtractorGDBRemote::eAck:
+  case StringExtractorGDBRemote::eNack:
+    break;
+
+  case StringExtractorGDBRemote::eResponse:
+    // JSON that is returned in from JSON query packets is currently always
+    // either a dictionary which starts with a '{', or an array which
+    // starts with a '['. This is a quick validator to just make sure the
+    // response could be valid JSON without having to validate all of the
+    // JSON content.
+    switch (response.GetStringRef()[0]) {
+    case '{':
+      return true;
+    case '[':
+      return true;
+    default:
+      break;
     }
-    return false;
+    break;
+  }
+  return false;
 }
 
 static bool
-ASCIIHexBytesResponseValidator(void *, const StringExtractorGDBRemote &response)
-{
-    switch (response.GetResponseType())
-    {
-        case StringExtractorGDBRemote::eUnsupported:
-        case StringExtractorGDBRemote::eError:
-            return true; // Accept unsupported or EXX as valid responses
-
-        case StringExtractorGDBRemote::eOK:
-        case StringExtractorGDBRemote::eAck:
-        case StringExtractorGDBRemote::eNack:
-            break;
-
-        case StringExtractorGDBRemote::eResponse:
-            {
-                uint32_t valid_count = 0;
-                for (const char ch : response.GetStringRef())
-                {
-                    if (!isxdigit(ch))
-                    {
-                        return false;
-                    }
-                    if (++valid_count >= 16)
-                        break; // Don't validate all the characters in case the packet is very large
-                }
-                return true;
-            }
-            break;
+ASCIIHexBytesResponseValidator(void *,
+                               const StringExtractorGDBRemote &response) {
+  switch (response.GetResponseType()) {
+  case StringExtractorGDBRemote::eUnsupported:
+  case StringExtractorGDBRemote::eError:
+    return true; // Accept unsupported or EXX as valid responses
+
+  case StringExtractorGDBRemote::eOK:
+  case StringExtractorGDBRemote::eAck:
+  case StringExtractorGDBRemote::eNack:
+    break;
+
+  case StringExtractorGDBRemote::eResponse: {
+    uint32_t valid_count = 0;
+    for (const char ch : response.GetStringRef()) {
+      if (!isxdigit(ch)) {
+        return false;
+      }
+      if (++valid_count >= 16)
+        break; // Don't validate all the characters in case the packet is very
+               // large
     }
-    return false;
+    return true;
+  } break;
+  }
+  return false;
 }
 
-void
-StringExtractorGDBRemote::CopyResponseValidator(const StringExtractorGDBRemote& rhs)
-{
-    m_validator = rhs.m_validator;
-    m_validator_baton = rhs.m_validator_baton;
+void StringExtractorGDBRemote::CopyResponseValidator(
+    const StringExtractorGDBRemote &rhs) {
+  m_validator = rhs.m_validator;
+  m_validator_baton = rhs.m_validator_baton;
 }
 
-void
-StringExtractorGDBRemote::SetResponseValidator(ResponseValidatorCallback callback, void *baton)
-{
-    m_validator = callback;
-    m_validator_baton = baton;
+void StringExtractorGDBRemote::SetResponseValidator(
+    ResponseValidatorCallback callback, void *baton) {
+  m_validator = callback;
+  m_validator_baton = baton;
 }
 
-void
-StringExtractorGDBRemote::SetResponseValidatorToOKErrorNotSupported()
-{
-    m_validator = OKErrorNotSupportedResponseValidator;
-    m_validator_baton = nullptr;
+void StringExtractorGDBRemote::SetResponseValidatorToOKErrorNotSupported() {
+  m_validator = OKErrorNotSupportedResponseValidator;
+  m_validator_baton = nullptr;
 }
 
-void
-StringExtractorGDBRemote::SetResponseValidatorToASCIIHexBytes()
-{
-    m_validator = ASCIIHexBytesResponseValidator;
-    m_validator_baton = nullptr;
+void StringExtractorGDBRemote::SetResponseValidatorToASCIIHexBytes() {
+  m_validator = ASCIIHexBytesResponseValidator;
+  m_validator_baton = nullptr;
 }
 
-void
-StringExtractorGDBRemote::SetResponseValidatorToJSON()
-{
-    m_validator = JSONResponseValidator;
-    m_validator_baton = nullptr;
+void StringExtractorGDBRemote::SetResponseValidatorToJSON() {
+  m_validator = JSONResponseValidator;
+  m_validator_baton = nullptr;
 }
 
-bool
-StringExtractorGDBRemote::ValidateResponse() const
-{
-    // If we have a validator callback, try to validate the callback
-    if (m_validator)
-        return m_validator(m_validator_baton, *this);
-    else
-        return true; // No validator, so response is valid
+bool StringExtractorGDBRemote::ValidateResponse() const {
+  // If we have a validator callback, try to validate the callback
+  if (m_validator)
+    return m_validator(m_validator_baton, *this);
+  else
+    return true; // No validator, so response is valid
 }
-
-