From 4fab267593324d02431c22981b90d94a05d2b521 Mon Sep 17 00:00:00 2001
From: occheung <dc@m-labs.hk>
Date: Wed, 1 Sep 2021 17:48:18 +0800
Subject: [PATCH] cargo: std dependency hack

---
 artiq/firmware/Cargo.lock       | 17 ++++++++++++-----
 artiq/firmware/libeh/Cargo.toml |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/artiq/firmware/Cargo.lock b/artiq/firmware/Cargo.lock
index 4d390505a..194952672 100644
--- a/artiq/firmware/Cargo.lock
+++ b/artiq/firmware/Cargo.lock
@@ -92,9 +92,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
+checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0"
 
 [[package]]
 name = "cfg-if"
@@ -108,6 +108,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "compiler_builtins"
+version = "0.1.39"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3748f82c7d366a0b4950257d19db685d4958d2fa27c6d164a3f069fec42b748b"
+
 [[package]]
 name = "crc"
 version = "1.8.1"
@@ -131,6 +137,7 @@ version = "0.0.0"
 name = "eh"
 version = "0.0.0"
 dependencies = [
+ "compiler_builtins",
  "cslice",
  "libc 0.1.0",
  "unwind",
@@ -158,7 +165,7 @@ name = "fringe"
 version = "1.2.1"
 source = "git+https://git.m-labs.hk/M-Labs/libfringe.git?rev=9748bb#9748bb8af86c131d45be1238ea4d5f965a974630"
 dependencies = [
- "libc 0.2.100",
+ "libc 0.2.101",
 ]
 
 [[package]]
@@ -199,9 +206,9 @@ version = "0.1.0"
 
 [[package]]
 name = "libc"
-version = "0.2.100"
+version = "0.2.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5"
+checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21"
 
 [[package]]
 name = "log"
diff --git a/artiq/firmware/libeh/Cargo.toml b/artiq/firmware/libeh/Cargo.toml
index 6908c14b9..6998fcd35 100644
--- a/artiq/firmware/libeh/Cargo.toml
+++ b/artiq/firmware/libeh/Cargo.toml
@@ -11,3 +11,4 @@ path = "lib.rs"
 cslice = { version = "0.3" }
 libc = { path = "../libc" }
 unwind = { path = "../libunwind" }
+compiler_builtins = "=0.1.39"    # A dependency of alloc, libeh doesn't need it