Update v35 armv7 (not updated since 2023) ##arch

radareorg · Dec 2, 2024 · f33843e · f33843e
1 parent 83c9f20
commit f33843e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/libr/arch/p/arm/v35/Makefile b/libr/arch/p/arm/v35/Makefile
@@ -1,7 +1,7 @@
 include ../../../../../global.mk
 
 ARCH_ARM64_COMMIT=cb7a22763c112e6ca99558edec2b6a9137234fdc
-ARCH_ARMV7_COMMIT=f270a6cc99644cb8e76055b6fa632b25abd26024
+ARCH_ARMV7_COMMIT=7d7a78f52196f6333bd5746dc526684edbfd9af0
 
 EXT_AR=a
 
@@ -43,7 +43,7 @@ $(V35ARM64_HOME)/arm64dis.a arm64dis.a: $(ALIBS)
 ## ARMV7
 arch-armv7:
 	git clone -q https://github.com/radareorg/vector35-arch-armv7 arch-armv7
-	cd arch-armv7 && git checkout -q radare2 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
+	cd arch-armv7 && git checkout -q radare2-2024 > /dev/null && git reset --hard $(ARCH_ARMV7_COMMIT)
 
 $(V35ARMV7_HOME)/armv7dis.a armv7dis.a: $(ALIBS)
 	rm -f armv7dis.$(EXT_AR)

diff --git a/libr/main/radare2.c b/libr/main/radare2.c
@@ -145,9 +145,9 @@ static int r_main_version_verify(RCore *core, bool show, bool json) {
 				pj_ko (pj, "armv7v35");
 				pj_ks (pj, "destdir", "libr/arch/p/arm/v35/arch-armv7");
 				pj_ks (pj, "git", "https://github.com/radareorg/vector35-arch-armv7");
-				pj_ks (pj, "commit", "f270a6cc99644cb8e76055b6fa632b25abd26024");
+				pj_ks (pj, "commit", "7d7a78f52196f6333bd5746dc526684edbfd9af0");
 				pj_ks (pj, "license", "Apache-2.0");
-				pj_ks (pj, "branch", "master");
+				pj_ks (pj, "branch", "radare2-2024");
 				pj_end (pj);
 			}
 			pj_end (pj);

diff --git a/preconfigure.bat b/preconfigure.bat
@@ -148,8 +148,8 @@ if EXIST "libr\arch\p\arm\v35\arch-armv7" (
   pushd "libr\arch\p\arm\v35"
   git clone https://github.com/radareorg/vector35-arch-armv7 arch-armv7
   cd arch-armv7
-  git checkout radare2
-  git reset --hard f270a6cc99644cb8e76055b6fa632b25abd26024
+  git checkout radare2-2024
+  git reset --hard 7d7a78f52196f6333bd5746dc526684edbfd9af0
   popd
 )