From 6df9944039cfca85c17374192b638f4a1a24cb7b Mon Sep 17 00:00:00 2001
From: Rain <rain@sunshowers.io>
Date: Sun, 22 May 2022 16:02:11 -0700
Subject: [PATCH] update targets to Rust 1.61

---
 Cargo.toml              |  2 +-
 src/targets.rs          |  2 +-
 src/targets/builtins.rs | 40 ++++++++++++++--------------------------
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cf950e0..b2b671e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ targets = ["target-lexicon"]
 
 [dependencies]
 smallvec = "1.8"
-target-lexicon = { version = "0.12.3", optional = true }
+target-lexicon = { version = "0.12.4", optional = true }
 
 [dev-dependencies]
 similar-asserts = "1.1"
diff --git a/src/targets.rs b/src/targets.rs
index d9dad10..2150312 100644
--- a/src/targets.rs
+++ b/src/targets.rs
@@ -364,7 +364,7 @@ pub fn get_builtin_target_by_triple(triple: &str) -> Option<&'static TargetInfo>
 /// versions.
 ///
 /// ```
-/// assert_eq!("1.60.0", cfg_expr::targets::rustc_version());
+/// assert_eq!("1.61.0", cfg_expr::targets::rustc_version());
 /// ```
 pub fn rustc_version() -> &'static str {
     builtins::RUSTC_VERSION
diff --git a/src/targets/builtins.rs b/src/targets/builtins.rs
index 74ee0a4..ac0265e 100644
--- a/src/targets/builtins.rs
+++ b/src/targets/builtins.rs
@@ -10,7 +10,7 @@
 
 use super::*;
 
-pub(crate) const RUSTC_VERSION: &str = "1.60.0";
+pub(crate) const RUSTC_VERSION: &str = "1.61.0";
 
 pub const ALL_BUILTINS: &[TargetInfo] = &[
     TargetInfo {
@@ -205,18 +205,6 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
         has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
         panic: Panic::abort,
     },
-    TargetInfo {
-        triple: Triple::new_const("aarch64-unknown-none-hermitkernel"),
-        os: None,
-        arch: Arch::aarch64,
-        env: None,
-        vendor: Some(Vendor::unknown),
-        families: Families::new_const(&[]),
-        pointer_width: 64,
-        endian: Endian::little,
-        has_atomics: HasAtomics::atomic_8_16_32_64_128_ptr,
-        panic: Panic::abort,
-    },
     TargetInfo {
         triple: Triple::new_const("aarch64-unknown-none-softfloat"),
         os: None,
@@ -1429,6 +1417,18 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
         has_atomics: HasAtomics::new_const(&[]),
         panic: Panic::abort,
     },
+    TargetInfo {
+        triple: Triple::new_const("riscv32im-unknown-none-elf"),
+        os: None,
+        arch: Arch::riscv32,
+        env: None,
+        vendor: Some(Vendor::unknown),
+        families: Families::new_const(&[]),
+        pointer_width: 32,
+        endian: Endian::little,
+        has_atomics: HasAtomics::new_const(&[]),
+        panic: Panic::abort,
+    },
     TargetInfo {
         triple: Triple::new_const("riscv32imac-unknown-none-elf"),
         os: None,
@@ -1450,7 +1450,7 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
         families: Families::unix,
         pointer_width: 32,
         endian: Endian::little,
-        has_atomics: HasAtomics::atomic_8_16_32_ptr,
+        has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
         panic: Panic::abort,
     },
     TargetInfo {
@@ -2077,18 +2077,6 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[
         has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
         panic: Panic::abort,
     },
-    TargetInfo {
-        triple: Triple::new_const("x86_64-unknown-none-hermitkernel"),
-        os: None,
-        arch: Arch::x86_64,
-        env: None,
-        vendor: Some(Vendor::unknown),
-        families: Families::new_const(&[]),
-        pointer_width: 64,
-        endian: Endian::little,
-        has_atomics: HasAtomics::atomic_8_16_32_64_ptr,
-        panic: Panic::abort,
-    },
     TargetInfo {
         triple: Triple::new_const("x86_64-unknown-none-linuxkernel"),
         os: None,