diff --git a/src/target/generated.rs b/src/target/generated.rs
index 973c10f2e..18717c90b 100644
--- a/src/target/generated.rs
+++ b/src/target/generated.rs
@@ -352,6 +352,42 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "aarch64-unknown-unknown",
         },
     ),
+    (
+        "aarch64-unknown-nto-qnx710_iosock",
+        TargetInfo {
+            full_arch: "aarch64",
+            arch: "aarch64",
+            vendor: "unknown",
+            os: "nto",
+            env: "nto71_iosock",
+            abi: "",
+            unversioned_llvm_target: "aarch64-unknown-unknown",
+        },
+    ),
+    (
+        "aarch64-unknown-nto-qnx800",
+        TargetInfo {
+            full_arch: "aarch64",
+            arch: "aarch64",
+            vendor: "unknown",
+            os: "nto",
+            env: "nto80",
+            abi: "",
+            unversioned_llvm_target: "aarch64-unknown-unknown",
+        },
+    ),
+    (
+        "aarch64-unknown-nuttx",
+        TargetInfo {
+            full_arch: "aarch64",
+            arch: "aarch64",
+            vendor: "unknown",
+            os: "nuttx",
+            env: "",
+            abi: "",
+            unversioned_llvm_target: "aarch64-unknown-none",
+        },
+    ),
     (
         "aarch64-unknown-openbsd",
         TargetInfo {
@@ -517,7 +553,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "linux",
             env: "musl",
             abi: "eabi",
-            unversioned_llvm_target: "arm-unknown-linux-gnueabi",
+            unversioned_llvm_target: "arm-unknown-linux-musleabi",
         },
     ),
     (
@@ -529,7 +565,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "linux",
             env: "musl",
             abi: "eabihf",
-            unversioned_llvm_target: "arm-unknown-linux-gnueabihf",
+            unversioned_llvm_target: "arm-unknown-linux-musleabihf",
         },
     ),
     (
@@ -685,7 +721,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "linux",
             env: "musl",
             abi: "eabi",
-            unversioned_llvm_target: "armv5te-unknown-linux-gnueabi",
+            unversioned_llvm_target: "armv5te-unknown-linux-musleabi",
         },
     ),
     (
@@ -707,7 +743,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             arch: "arm",
             vendor: "unknown",
             os: "freebsd",
-            env: "gnu",
+            env: "",
             abi: "eabihf",
             unversioned_llvm_target: "armv6-unknown-freebsd-gnueabihf",
         },
@@ -791,7 +827,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             arch: "arm",
             vendor: "unknown",
             os: "freebsd",
-            env: "gnu",
+            env: "",
             abi: "eabihf",
             unversioned_llvm_target: "armv7-unknown-freebsd-gnueabihf",
         },
@@ -829,7 +865,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "linux",
             env: "musl",
             abi: "eabi",
-            unversioned_llvm_target: "armv7-unknown-linux-gnueabi",
+            unversioned_llvm_target: "armv7-unknown-linux-musleabi",
         },
     ),
     (
@@ -841,7 +877,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "linux",
             env: "musl",
             abi: "eabihf",
-            unversioned_llvm_target: "armv7-unknown-linux-gnueabihf",
+            unversioned_llvm_target: "armv7-unknown-linux-musleabihf",
         },
     ),
     (
@@ -964,6 +1000,30 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "armv7a-none-eabihf",
         },
     ),
+    (
+        "armv7a-nuttx-eabi",
+        TargetInfo {
+            full_arch: "armv7a",
+            arch: "arm",
+            vendor: "unknown",
+            os: "nuttx",
+            env: "",
+            abi: "eabi",
+            unversioned_llvm_target: "armv7a-none-eabi",
+        },
+    ),
+    (
+        "armv7a-nuttx-eabihf",
+        TargetInfo {
+            full_arch: "armv7a",
+            arch: "arm",
+            vendor: "unknown",
+            os: "nuttx",
+            env: "",
+            abi: "eabihf",
+            unversioned_llvm_target: "armv7a-none-eabihf",
+        },
+    ),
     (
         "armv7k-apple-watchos",
         TargetInfo {
@@ -1384,6 +1444,18 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "i686-pc-windows-msvc",
         },
     ),
+    (
+        "i686-win7-windows-gnu",
+        TargetInfo {
+            full_arch: "i686",
+            arch: "x86",
+            vendor: "win7",
+            os: "windows",
+            env: "gnu",
+            abi: "",
+            unversioned_llvm_target: "i686-pc-windows-gnu",
+        },
+    ),
     (
         "i686-win7-windows-msvc",
         TargetInfo {
@@ -1480,6 +1552,30 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "m68k-unknown-linux-gnu",
         },
     ),
+    (
+        "m68k-unknown-none-elf",
+        TargetInfo {
+            full_arch: "m68k",
+            arch: "m68k",
+            vendor: "unknown",
+            os: "none",
+            env: "",
+            abi: "",
+            unversioned_llvm_target: "m68k",
+        },
+    ),
+    (
+        "mips-mti-none-elf",
+        TargetInfo {
+            full_arch: "mips",
+            arch: "mips",
+            vendor: "mti",
+            os: "none",
+            env: "",
+            abi: "",
+            unversioned_llvm_target: "mips",
+        },
+    ),
     (
         "mips-unknown-linux-gnu",
         TargetInfo {
@@ -1576,6 +1672,18 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "mips64el-unknown-linux-musl",
         },
     ),
+    (
+        "mipsel-mti-none-elf",
+        TargetInfo {
+            full_arch: "mipsel",
+            arch: "mips",
+            vendor: "mti",
+            os: "none",
+            env: "",
+            abi: "",
+            unversioned_llvm_target: "mipsel",
+        },
+    ),
     (
         "mipsel-sony-psp",
         TargetInfo {
@@ -1594,8 +1702,8 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             full_arch: "mipsel",
             arch: "mips",
             vendor: "sony",
-            os: "none",
-            env: "psx",
+            os: "psx",
+            env: "",
             abi: "",
             unversioned_llvm_target: "mipsel-sony-psx",
         },
@@ -1968,7 +2076,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             vendor: "unknown",
             os: "none",
             env: "",
-            abi: "",
+            abi: "ilp32e",
             unversioned_llvm_target: "riscv32",
         },
     ),
@@ -1980,7 +2088,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             vendor: "unknown",
             os: "none",
             env: "",
-            abi: "",
+            abi: "ilp32e",
             unversioned_llvm_target: "riscv32",
         },
     ),
@@ -1992,7 +2100,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             vendor: "unknown",
             os: "none",
             env: "",
-            abi: "",
+            abi: "ilp32e",
             unversioned_llvm_target: "riscv32",
         },
     ),
@@ -2488,6 +2596,30 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "thumbv6m-none-eabi",
         },
     ),
+    (
+        "thumbv7a-nuttx-eabi",
+        TargetInfo {
+            full_arch: "thumbv7a",
+            arch: "arm",
+            vendor: "unknown",
+            os: "nuttx",
+            env: "",
+            abi: "eabi",
+            unversioned_llvm_target: "thumbv7a-none-eabi",
+        },
+    ),
+    (
+        "thumbv7a-nuttx-eabihf",
+        TargetInfo {
+            full_arch: "thumbv7a",
+            arch: "arm",
+            vendor: "unknown",
+            os: "nuttx",
+            env: "",
+            abi: "eabihf",
+            unversioned_llvm_target: "thumbv7a-none-eabihf",
+        },
+    ),
     (
         "thumbv7a-pc-windows-msvc",
         TargetInfo {
@@ -2617,7 +2749,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "linux",
             env: "musl",
             abi: "eabihf",
-            unversioned_llvm_target: "armv7-unknown-linux-gnueabihf",
+            unversioned_llvm_target: "armv7-unknown-linux-musleabihf",
         },
     ),
     (
@@ -2723,7 +2855,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             arch: "wasm32",
             vendor: "unknown",
             os: "wasi",
-            env: "p1",
+            env: "",
             abi: "",
             unversioned_llvm_target: "wasm32-wasi",
         },
@@ -2737,7 +2869,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "wasi",
             env: "p1",
             abi: "",
-            unversioned_llvm_target: "wasm32-wasi",
+            unversioned_llvm_target: "wasm32-wasip1",
         },
     ),
     (
@@ -2896,6 +3028,30 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "x86_64-pc-unknown",
         },
     ),
+    (
+        "x86_64-pc-nto-qnx710_iosock",
+        TargetInfo {
+            full_arch: "x86_64",
+            arch: "x86_64",
+            vendor: "pc",
+            os: "nto",
+            env: "nto71_iosock",
+            abi: "",
+            unversioned_llvm_target: "x86_64-pc-unknown",
+        },
+    ),
+    (
+        "x86_64-pc-nto-qnx800",
+        TargetInfo {
+            full_arch: "x86_64",
+            arch: "x86_64",
+            vendor: "pc",
+            os: "nto",
+            env: "nto80",
+            abi: "",
+            unversioned_llvm_target: "x86_64-pc-unknown",
+        },
+    ),
     (
         "x86_64-pc-solaris",
         TargetInfo {
@@ -3232,6 +3388,18 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             unversioned_llvm_target: "x86_64-pc-windows-msvc",
         },
     ),
+    (
+        "x86_64-win7-windows-gnu",
+        TargetInfo {
+            full_arch: "x86_64",
+            arch: "x86_64",
+            vendor: "win7",
+            os: "windows",
+            env: "gnu",
+            abi: "",
+            unversioned_llvm_target: "x86_64-pc-windows-gnu",
+        },
+    ),
     (
         "x86_64-win7-windows-msvc",
         TargetInfo {
@@ -3241,7 +3409,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "windows",
             env: "msvc",
             abi: "",
-            unversioned_llvm_target: "x86_64-win7-windows-msvc",
+            unversioned_llvm_target: "x86_64-pc-windows-msvc",
         },
     ),
     (