Add back ARM tools

earlephilhower · Sep 23, 2024 · 2506047 · 2506047
1 parent 8b64995
commit 2506047
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 0 deletions.
diff --git a/cores/rp2040/lock.cpp b/cores/rp2040/lock.cpp
@@ -99,7 +99,12 @@ static SemaphoreHandle_t __getFreeRTOSRecursiveMutex(_LOCK_T lock) {
  return __get_freertos_mutex_for_ptr((mutex_t *)l, true);
 }
 
+#ifdef __riscv
 void __retarget_lock_init(_LOCK_T lock) {
+#else
+void __retarget_lock_init(_LOCK_T *lock) {
+ // TODO TBD - Rebuild ARM lib
+#endif
  if (__freeRTOSinitted) {
  mutex_t *l = (mutex_t *)lock;
  if ((l == &__lock___at_quick_exit_mutex) || (l == &__lock___tz_mutex) || (l == &__lock___dd_hash_mutex) || (l == &__lock___arc4random_mutex)) {
@@ -113,7 +118,12 @@ void __retarget_lock_init(_LOCK_T lock) {
  }
 }
 
+#ifdef __riscv
 void __retarget_lock_init_recursive(_LOCK_T lock) {
+#else
+void __retarget_lock_init_recursive(_LOCK_T *lock) {
+ // TODO TBD - Rebuild ARM lib
+#endif
  if (__freeRTOSinitted) {
  recursive_mutex_t *l = (recursive_mutex_t *)lock;
  if ((l == &__lock___sinit_recursive_mutex) || (l == &__lock___sfp_recursive_mutex) || (l == &__lock___atexit_recursive_mutex) || (l == &__lock___malloc_recursive_mutex) || (l == &__lock___env_recursive_mutex)) {

diff --git a/package/package_pico_index.template.json b/package/package_pico_index.template.json
@@ -331,6 +331,11 @@
  }
  ],
  "toolsDependencies": [
+ {
+ "packager": "rp2040",
+ "version": "2.3.0-dfd82b2",
+ "name": "pqt-gcc"
+ },
  {
  "packager": "rp2040",
  "version": "4.0.0-b1fade8",
@@ -368,6 +373,68 @@
  }
  ],
  "tools": [
+ {
+ "version": "2.3.0-dfd82b2",
+ "name": "pqt-gcc",
+ "systems": [
+ {
+ "host": "arm64-apple-darwin",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/aarch64-apple-darwin20.4.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "archiveFileName": "aarch64-apple-darwin20.4.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "checksum": "SHA-256:9a0bce8ae3d28489cdc2bf4d1d849b7b9c93f13b74f2449d07499f224801ed99",
+ "size": "96802517"
+ },
+ {
+ "host": "aarch64-linux-gnu",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/aarch64-linux-gnu.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "archiveFileName": "aarch64-linux-gnu.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "checksum": "SHA-256:04dfe507037553fb5b0844bfc674d7f39cb8fa30fedbd72739b4c5324b260e04",
+ "size": "103997060"
+ },
+ {
+ "host": "arm-linux-gnueabihf",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/arm-linux-gnueabihf.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "archiveFileName": "arm-linux-gnueabihf.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "checksum": "SHA-256:365dd442d1d2cc284ddc7c1df7f96620e4b9169de268f4c2c2dd85f515724838",
+ "size": "97831453"
+ },
+ {
+ "host": "i686-pc-linux-gnu",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/i686-linux-gnu.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "archiveFileName": "i686-linux-gnu.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "checksum": "SHA-256:8844d6c9f9040a673c0354b9fdc413faaa8f4075292f8b9fdefca020c0a7cd03",
+ "size": "106646523"
+ },
+ {
+ "host": "i686-mingw32",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/i686-w64-mingw32.arm-none-eabi-dfd82b2.240919.zip",
+ "archiveFileName": "i686-w64-mingw32.arm-none-eabi-dfd82b2.240919.zip",
+ "checksum": "SHA-256:11ff0b24c557cf8334450c6f4826230ec2f25efbf0792f506c3009e2663205ea",
+ "size": "113765075"
+ },
+ {
+ "host": "x86_64-apple-darwin",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/x86_64-apple-darwin20.4.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "archiveFileName": "x86_64-apple-darwin20.4.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "checksum": "SHA-256:c11b7f19751a13ba2fb456eaf209472666d77dec8720d51ef44091b8a6fadfa9",
+ "size": "108052800"
+ },
+ {
+ "host": "x86_64-pc-linux-gnu",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/x86_64-linux-gnu.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "archiveFileName": "x86_64-linux-gnu.arm-none-eabi-dfd82b2.240919.tar.gz",
+ "checksum": "SHA-256:1f37b78a9d371659e2a45b8c602046ec6a1c920f36959fc702db9c68cc2c778c",
+ "size": "106789920"
+ },
+ {
+ "host": "x86_64-mingw32",
+ "url": "https:/earlephilhower/pico-quick-toolchain/releases/download/2.3.0/x86_64-w64-mingw32.arm-none-eabi-dfd82b2.240919.zip",
+ "archiveFileName": "x86_64-w64-mingw32.arm-none-eabi-dfd82b2.240919.zip",
+ "checksum": "SHA-256:ee3ed6354ccf71fcfdb2083859ffafc0e2dd6982906f14d3cdb501a85db6cbd8",
+ "size": "117655702"
+ }
+ ]
+ },
  {
  "version": "4.0.0-b1fade8",
  "name": "pqt-picotool",