commit 779a34e6a9adcb6528e63d595a7a8838747e7915
author Botspot <54716352+Botspot@users.noreply.github.com> Mon Mar 22 14:56:25 2021 -0500
committer Jordan Harband <ljharb@gmail.com> Mon Mar 22 14:56:25 2021 -0500
tree 772b8518321773109bc6ac32fcbeb68e70e0a65e
parent 2b5e53fcd57409e018b468fd05eebad06fbff3fa

[Fix] `nvm_get_arch`: Rasbperry Pi: armv7l with arm64 kernel, get correct arch

Co-authored-by: Botspot <54716352+Botspot@users.noreply.github.com>
Co-authored-by: Jordan Harband <ljharb@gmail.com>
Co-authored-by: Sladyn Nunes <sladynnunes98@gmail.com>

nvm.sh

diff --git a/nvm.sh b/nvm.sh
index edf964a..aab6c5d 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -1796,6 +1796,14 @@
     aarch64) NVM_ARCH="arm64" ;;
     *) NVM_ARCH="${HOST_ARCH}" ;;
   esac
+
+  # If running a 64bit ARM kernel but a 32bit ARM userland, change ARCH to 32bit ARM (armv7l)
+  L=$(ls -dl /sbin/init) #                                         if /sbin/init is 32bit executable
+  if [ "$(uname)" = "Linux" ] && [ "${NVM_ARCH}" = arm64 ] && [ "$(od -An -t x1 -j 4 -N 1 "${L#*-> }")" = ' 01' ]; then
+    NVM_ARCH=armv7l
+    HOST_ARCH=armv7l
+  fi
+
   nvm_echo "${NVM_ARCH}"
 }
 

test/fast/Unit tests/nvm_get_arch

diff --git a/test/fast/Unit tests/nvm_get_arch b/test/fast/Unit tests/nvm_get_arch
index f064203..aaf3e83 100755
--- a/test/fast/Unit tests/nvm_get_arch
+++ b/test/fast/Unit tests/nvm_get_arch
@@ -79,4 +79,6 @@
 run_test x86 osx x86
 run_test amd64 osx x64
 
+run_test arm64 smartos x64
+
 cleanup