Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update v35 armv7 #23719

Merged
merged 2 commits into from
Dec 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libr/arch/p/arm/v35/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include ../../../../../global.mk

ARCH_ARM64_COMMIT=cb7a22763c112e6ca99558edec2b6a9137234fdc
ARCH_ARMV7_COMMIT=f270a6cc99644cb8e76055b6fa632b25abd26024
ARCH_ARMV7_COMMIT=7d7a78f52196f6333bd5746dc526684edbfd9af0

EXT_AR=a

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions libr/main/radare2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions preconfigure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
Loading