Merge branch 'master' into v2.1

diff --cc doc/install.html
index 8210f476040bba05be4f38204e7f87dd6794e3a5,19fab1b8e6052f3dba6251de9bff9f3d807d973b..c3b951e449cfddcd16e739b711e0138ff654e04a
--- 1/doc/install.html
--- 2/doc/install.html
+++ b/doc/install.html
@@@ -599,55 -546,38 +604,58 @@@ To cross-compile for <b id="ps3">PS3</b
  make HOST_CC="gcc -m32" CROSS=ppu-lv2-
  </pre>
  <p>
- To cross-compile for <b id="ps4">PS4</b> from a Windows host,
- open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler),
- <tt>cd</tt> to the directory where you've unpacked the sources and
- run the following commands:
- </p>
- <pre class="code">
- cd src
- ps4build
- </pre>
- <p>
- To cross-compile for <b id="ps5">PS5</b> from a Windows host,
- open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler),
- <tt>cd</tt> to the directory where you've unpacked the sources and
- run the following commands:
- </p>
- <pre class="code">
- cd src
- ps5build
- </pre>
- <p>
- To cross-compile for <b id="psvita">PS Vita</b> from a Windows host,
- open a "Visual Studio .NET Command Prompt" (32&nbsp;bit host compiler),
- <tt>cd</tt> to the directory where you've unpacked the sources and
- run the following commands:
+ To cross-compile for the other consoles from a Windows host, open a
+ "Native Tools Command Prompt for VS". You need to choose either the 32
+ or the 64&nbsp;bit version of the host compiler to match the target.
+ Then <tt>cd</tt> to the <tt>src</tt> directory below where you've
+ unpacked the sources and run the build command given in the table:
  </p>
- <pre class="code">
- cd src
- psvitabuild
- </pre>
- <p>
- To cross-compile for <b id="xbox360">Xbox 360</b> from a Windows host,
- open a "Visual Studio .NET Command Prompt" (32&nbsp;bit host compiler),
- <tt>cd</tt> to the directory where you've unpacked the sources and run
- the following commands:
- </p>
- <pre class="code">
- cd src
- xedkbuild
- </pre>
+ <table class="compat">
+ <tr class="compathead">
+ <td class="compatname">Console</td>
+ <td class="compatbits">Bits</td>
+ <td class="compatx">Build Command</td>
+ </tr>
+ <tr class="odd separate">
+ <td class="compatname"><b id="ps4">PS4</b></td>
+ <td class="compatbits">64</td>
+ <td class="compatx"><tt>ps4build</tt></td>
+ </tr>
+ <tr class="even">
++<td class="compatname"><b id="ps5">PS5</b></td>
++<td class="compatbits">64</td>
++<td class="compatx"><tt>ps5build</tt></td>
++</tr>
++<tr class="odd">
+ <td class="compatname"><b id="psvita">PS Vita</b></td>
+ <td class="compatbits">32</td>
+ <td class="compatx"><tt>psvitabuild</tt></td>
+ </tr>
 -<tr class="odd">
++<tr class="even">
+ <td class="compatname"><b id="xbox360">Xbox 360</b></td>
+ <td class="compatbits">32</td>
+ <td class="compatx"><tt>xedkbuild</tt></td>
+ </tr>
++<tr class="odd">
++<td class="compatname"><b id="xboxone">Xbox One</b></td>
++<td class="compatbits">64</td>
++<td class="compatx"><tt>xb1build</tt></td>
++</tr>
++<tr class="even">
++<td class="compatname"><b id="nx32">Nintendo Switch NX32</b></td>
++<td class="compatbits">32</td>
++<td class="compatx"><tt>nxbuild</tt></td>
++</tr>
++<tr class="odd">
++<td class="compatname"><b id="nx64">Nintendo Switch NX64</b></td>
++<td class="compatbits">64</td>
++<td class="compatx"><tt>nxbuild</tt></td>
++</tr>
+ </table>
  <p>
- To cross-compile for <b id="xboxone">Xbox One</b> from a Windows host,
- open a "Visual Studio .NET Command Prompt" (64&nbsp;bit host compiler),
- <tt>cd</tt> to the directory where you've unpacked the sources and run
- the following commands:
+ Please check out the comments in the corresponding <tt>*.bat</tt>
+ file for more options.
  </p>
- <pre class="code">
- cd src
- xb1build
- </pre>
  
  <h2 id="embed">Embedding LuaJIT</h2>
  <p>

diff --cc doc/luajit.html
index 06774ddf42e4e18f19702a99a985286d0aeacb05,88d4c19467782bf518b6ddfbb657ae5db6426b6f..03a2952869d4dc8a4d9a0ff9a606db7abfb271da
--- 1/doc/luajit.html
--- 2/doc/luajit.html
+++ b/doc/luajit.html
@@@ -162,13 -158,13 +162,13 @@@ LuaJIT is Copyright © 2005-2022 Mi
  <tr><td><span style="font-size:90%;">Embedded</span></td><td>Android</td><td>iOS</td></tr>
  </table>
  <table class="feature os os3">
- <tr><td>PS3</td><td>PS4</td><td>PS5</td><td>PS Vita</td><td>Xbox 360</td><td>Xbox One</td></tr>
 -<tr><td>PS3</td><td>PS4</td><td>PS Vita</td><td>Xbox 360</td></tr>
++<tr><td>PS3</td><td>PS4<br>PS5</td><td>PS Vita</td><td>Xbox 360</td><td>Xbox One</td><td>Nintendo<br>Switch</td></tr>
  </table>
  <table class="feature compiler">
 -<tr><td>GCC</td><td>CLANG<br>LLVM</td><td>MSVC</td></tr>
 +<tr><td>GCC</td><td>Clang<br>LLVM</td><td>MSVC</td></tr>
  </table>
  <table class="feature cpu">
 -<tr><td>x86</td><td>x64</td><td>ARM</td><td>PPC</td><td>e500</td><td>MIPS</td></tr>
 +<tr><td>x86<br>x64</td><td>ARM<br>ARM64</td><td>PPC</td><td>MIPS32<br>MIPS64</td></tr>
  </table>
  <table class="feature fcompat">
  <tr><td>Lua&nbsp;5.1<br>API+ABI</td><td>+&nbsp;JIT</td><td>+&nbsp;BitOp</td><td>+&nbsp;FFI</td><td>Drop-in<br>DLL/.so</td></tr>