From 810af46a42a385b29418b2b3a2aee1ea97e2014e Mon Sep 17 00:00:00 2001
From: Yuwen Zhang <yuwen01@gmail.com>
Date: Mon, 4 Nov 2024 20:11:41 -0800
Subject: [PATCH 1/3] fix riscv target

---
 secp256k1-sys/build.rs | 2 +-
 src/ecdsa/mod.rs       | 6 +++---
 src/ecdsa/recovery.rs  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/secp256k1-sys/build.rs b/secp256k1-sys/build.rs
index f30f8b5fa..d4ec5ae95 100644
--- a/secp256k1-sys/build.rs
+++ b/secp256k1-sys/build.rs
@@ -48,7 +48,7 @@ fn main() {
             .flag("-fdata-sections")
             .flag("-ffunction-sections")
             .flag("-flto")
-            .target("riscv32-unknown-none-elf");
+            .target("riscv32im-unknown-none-elf");
     }
 
     base_config.include("depend/secp256k1/")
diff --git a/src/ecdsa/mod.rs b/src/ecdsa/mod.rs
index 6e922c3fd..f6346eda0 100644
--- a/src/ecdsa/mod.rs
+++ b/src/ecdsa/mod.rs
@@ -2,11 +2,11 @@
 
 //! Structs and functionality related to the ECDSA signature algorithm.
 //!
-#[cfg(all(target_os = "zkvm", target_vendor = "succinct"))]
+#[cfg(all(target_os = "zkvm"))]
 use elliptic_curve;
-#[cfg(all(target_os = "zkvm", target_vendor = "succinct"))]
+#[cfg(all(target_os = "zkvm"))]
 use k256;
-#[cfg(all(target_os = "zkvm", target_vendor = "succinct"))]
+#[cfg(all(target_os = "zkvm"))]
 use sp1_ecdsa;
 
 #[cfg(feature = "recovery")]
diff --git a/src/ecdsa/recovery.rs b/src/ecdsa/recovery.rs
index 7632e8545..7afe4e3b4 100644
--- a/src/ecdsa/recovery.rs
+++ b/src/ecdsa/recovery.rs
@@ -207,7 +207,7 @@ impl<C: Verification> Secp256k1<C> {
         sig: &RecoverableSignature,
     ) -> Result<key::PublicKey, Error> {
         cfg_if::cfg_if! {
-            if #[cfg(all(target_os = "zkvm", target_vendor = "succinct"))] {
+            if #[cfg(all(target_os = "zkvm"))] {
                 // `msg.0` contains the message data as a byte array.
                 let prehash: &[u8] = &msg.0;
 

From a16a42d7bc6fbd2c20ec75a7e4aeab6c74c6515c Mon Sep 17 00:00:00 2001
From: Yuwen Zhang <yuwen01@gmail.com>
Date: Mon, 4 Nov 2024 20:18:39 -0800
Subject: [PATCH 2/3] un-diff vendor thing

---
 src/ecdsa/mod.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ecdsa/mod.rs b/src/ecdsa/mod.rs
index f6346eda0..6e922c3fd 100644
--- a/src/ecdsa/mod.rs
+++ b/src/ecdsa/mod.rs
@@ -2,11 +2,11 @@
 
 //! Structs and functionality related to the ECDSA signature algorithm.
 //!
-#[cfg(all(target_os = "zkvm"))]
+#[cfg(all(target_os = "zkvm", target_vendor = "succinct"))]
 use elliptic_curve;
-#[cfg(all(target_os = "zkvm"))]
+#[cfg(all(target_os = "zkvm", target_vendor = "succinct"))]
 use k256;
-#[cfg(all(target_os = "zkvm"))]
+#[cfg(all(target_os = "zkvm", target_vendor = "succinct"))]
 use sp1_ecdsa;
 
 #[cfg(feature = "recovery")]

From 9edab77f21e8732fda48564b33a7b30a0237e539 Mon Sep 17 00:00:00 2001
From: Yuwen Zhang <yuwen01@gmail.com>
Date: Mon, 4 Nov 2024 20:25:08 -0800
Subject: [PATCH 3/3] more un-diffing

---
 src/ecdsa/recovery.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ecdsa/recovery.rs b/src/ecdsa/recovery.rs
index 7afe4e3b4..7632e8545 100644
--- a/src/ecdsa/recovery.rs
+++ b/src/ecdsa/recovery.rs
@@ -207,7 +207,7 @@ impl<C: Verification> Secp256k1<C> {
         sig: &RecoverableSignature,
     ) -> Result<key::PublicKey, Error> {
         cfg_if::cfg_if! {
-            if #[cfg(all(target_os = "zkvm"))] {
+            if #[cfg(all(target_os = "zkvm", target_vendor = "succinct"))] {
                 // `msg.0` contains the message data as a byte array.
                 let prehash: &[u8] = &msg.0;