diff --git a/unstuck-cargo-qemu-riscv64-static/COPYING b/unstuck-cargo-qemu-riscv64-static/COPYING
new file mode 100644
index 0000000..670154e
--- /dev/null
+++ b/unstuck-cargo-qemu-riscv64-static/COPYING
@@ -0,0 +1,116 @@
+CC0 1.0 Universal
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later
+claims of infringement build upon, modify, incorporate in other works, reuse
+and redistribute as freely as possible in any form whatsoever and for any
+purposes, including without limitation commercial purposes. These owners may
+contribute to the Commons to promote the ideal of a free culture and the
+further production of creative, cultural and scientific works, or to gain
+reputation or greater distribution for their Work in part through the use and
+efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with a
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or her
+Copyright and Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not limited
+to, the following:
+
+ i. the right to reproduce, adapt, distribute, perform, display, communicate,
+ and translate a Work;
+
+ ii. moral rights retained by the original author(s) and/or performer(s);
+
+ iii. publicity and privacy rights pertaining to a person's image or likeness
+ depicted in a Work;
+
+ iv. rights protecting against unfair competition in regards to a Work,
+ subject to the limitations in paragraph 4(a), below;
+
+ v. rights protecting the extraction, dissemination, use and reuse of data in
+ a Work;
+
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+ European Parliament and of the Council of 11 March 1996 on the legal
+ protection of databases, and under any national implementation thereof,
+ including any amended or successor version of such directive); and
+
+ vii. other similar, equivalent or corresponding rights throughout the world
+ based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free,
+non transferable, non sublicensable, non exclusive, irrevocable and
+unconditional license to exercise Affirmer's Copyright and Related Rights in
+the Work (i) in all territories worldwide, (ii) for the maximum duration
+provided by applicable law or treaty (including future time extensions), (iii)
+in any current or future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective as
+of the date CC0 was applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+ surrendered, licensed or otherwise affected by this document.
+
+ b. Affirmer offers the Work as-is and makes no representations or warranties
+ of any kind concerning the Work, express, implied, statutory or otherwise,
+ including without limitation warranties of title, merchantability, fitness
+ for a particular purpose, non infringement, or the absence of latent or
+ other defects, accuracy, or the present or absence of errors, whether or not
+ discoverable, all to the greatest extent permissible under applicable law.
+
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+ that may apply to the Work or any use thereof, including without limitation
+ any person's Copyright and Related Rights in the Work. Further, Affirmer
+ disclaims responsibility for obtaining any necessary consents, permissions
+ or other rights required for any use of the Work.
+
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+ party to this document and has no duty or obligation with respect to this
+ CC0 or use of the Work.
+
+For more information, please see
+
diff --git a/unstuck-cargo-qemu-riscv64-static/README.md b/unstuck-cargo-qemu-riscv64-static/README.md
new file mode 100644
index 0000000..c63eb43
--- /dev/null
+++ b/unstuck-cargo-qemu-riscv64-static/README.md
@@ -0,0 +1,19 @@
+Unstuck Cargo When Building via qemu-riscv64-static
+======
+
+The little script is to help you unstuck your rustc/cargo build when you are building via qemu-riscv64-static, by manually updating futex status.
+
+Usage:
+
+ ```
+ bash unstuck-cargo-qemu-riscv64-static.sh
+ ```
+
+or automatically unstuck:
+
+ ```
+ bash unstuck-cargo-qemu-riscv64-static-auto.sh
+ ```
+
+Author: liushuyu
+Maintainer: Camber Huang
diff --git a/unstuck-cargo-qemu-riscv64-static/unstuck-cargo-qemu-riscv64-static-auto.sh b/unstuck-cargo-qemu-riscv64-static/unstuck-cargo-qemu-riscv64-static-auto.sh
new file mode 100644
index 0000000..f53b5fd
--- /dev/null
+++ b/unstuck-cargo-qemu-riscv64-static/unstuck-cargo-qemu-riscv64-static-auto.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -e
+# Automatically watch for rustc/cargo for stuck status, and attempt to unstuck
+## Author: liushuyu
+## Maintainer: Camber Huang
+
+echo "Watching for cargo/rustc status ..."
+echo "Press Ctrl-C to exit"
+while true; do
+ sleep 15
+ if pgrep -r Z rustc; then
+ echo "Cargo/Rustc is stuck! Unstuck ..."
+ # You may replace the following line with the actual location of main script.
+ bash ./unstuck-cargo-qemu-riscv64-static.sh
+ fi
+done
diff --git a/unstuck-cargo-qemu-riscv64-static/unstuck-cargo-qemu-riscv64-static.sh b/unstuck-cargo-qemu-riscv64-static/unstuck-cargo-qemu-riscv64-static.sh
new file mode 100644
index 0000000..20bb74e
--- /dev/null
+++ b/unstuck-cargo-qemu-riscv64-static/unstuck-cargo-qemu-riscv64-static.sh
@@ -0,0 +1,26 @@
+#!/bin/bash -e
+# Attempt to unstuck cargo/rustc when building via qemu-riscv64-static by updating futex status
+## Author: liushuyu
+## Maintainer: Camber Huang
+
+## FIXME: Find a way to locate cargo executed by qemu-riscv64-static
+echo "Trying to unstuck qemu emulated cargo ..."
+TARGET_PID="$(pgrep cargo | tail -n1)"
+if [ -z "$TARGET_PID" ]; then
+ echo "No cargo process found"
+ exit 1
+fi
+
+echo "Found cargo PID: ${TARGET_PID}, tracing ..."
+timeout 3 strace -o /tmp/qtrace.log -p "${TARGET_PID}"
+UADDR="$(perl -ne '/futex\((.+?),/ && print "$1\n"' < /tmp/qtrace.log)"
+
+echo "Trying to unlock the futex in ${TARGET_PID} at RVA ${UADDR} ..."
+cat << EOF > /tmp/qscript.gdb
+set *${UADDR}=0
+quit
+EOF
+
+gdb --batch --command=/tmp/qscript.gdb --pid="${TARGET_PID}"
+
+rm -v /tmp/qtrace.log /tmp/qscript.gdb