diff --git a/src/target/generated.rs b/src/target/generated.rs
index 973c10f2e..f2245eb96 100644
--- a/src/target/generated.rs
+++ b/src/target/generated.rs
@@ -517,7 +517,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 +529,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 +685,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 +707,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 +791,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 +829,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 +841,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",
         },
     ),
     (
@@ -1594,8 +1594,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",
         },
@@ -2617,7 +2617,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 +2723,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 +2737,7 @@ pub(crate) const LIST: &[(&str, TargetInfo<'static>)] = &[
             os: "wasi",
             env: "p1",
             abi: "",
-            unversioned_llvm_target: "wasm32-wasi",
+            unversioned_llvm_target: "wasm32-wasip1",
         },
     ),
     (
@@ -3241,7 +3241,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",
         },
     ),
     (