From f91f2ac1d88999c6d3c170189c3864fe6246c5bf Mon Sep 17 00:00:00 2001 From: pancake Date: Mon, 6 Jul 2020 06:12:00 +0200 Subject: [PATCH] Update capstone git commits for v4 and next branches (#17215) Co-authored-by: pancake --- shlr/Makefile | 4 ++-- shlr/meson.build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/shlr/Makefile b/shlr/Makefile index d101805367..e67419f3d2 100644 --- a/shlr/Makefile +++ b/shlr/Makefile @@ -44,10 +44,10 @@ CS_ARCHIVE=https://$(CS_URL_BASE)/archive CS_UPD=20190515 # NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/meson.build ifeq ($(CS_NEXT),1) -CS_TIP=0de88ed3fdc0ab1f1e2a6eada3cdd93e18057a0f +CS_TIP=d956ceddabcbe544ee8f074ba75c86c6381b34e6 CS_BRA=next else -CS_TIP=c80b6aaf973c822d82565f25e9b2e2c0102626fa +CS_TIP=2edae851d9fee511a57d4da32d5acecedd95d7ed CS_BRA=v4 endif ifeq ($(CS_COMMIT_ARCHIVE),1) diff --git a/shlr/meson.build b/shlr/meson.build index 84508353c7..12176e4717 100644 --- a/shlr/meson.build +++ b/shlr/meson.build @@ -18,10 +18,10 @@ if not capstone_dep.found() or not get_option('use_sys_capstone') # NOTE: when you update CS_TIP or CS_BRA, also update them in shlr/Makefile use_capstone5 = get_option('use_capstone5') if use_capstone5 - CS_TIP = '0de88ed3fdc0ab1f1e2a6eada3cdd93e18057a0f' + CS_TIP = 'd956ceddabcbe544ee8f074ba75c86c6381b34e6' CS_BRA = 'next' else - CS_TIP = 'c80b6aaf973c822d82565f25e9b2e2c0102626fa' + CS_TIP = '2edae851d9fee511a57d4da32d5acecedd95d7ed' CS_BRA = 'v4' endif