From bcc502cff9fea2d892a0344879e420df1d10fb47 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Mon, 10 Nov 2014 11:22:10 -0600 Subject: Make TWRP compile for arm64 -Remove dosfstools for arm64 until we can make it compile -Fix TW_USE_TOOLBOX flag to work again -Fix symlinking and handling of sh when using mksh -Fix legacy properties to find futex_wake function -Fix libcrecovery to not use bsd_signal anymore -Fix rules for building with regards to libcrecovery -Update toolbox_recovery rules to compile tools in lollipop -Fix a few compile errors specific to arm64 Testers report that TWRP does not boot on Nexus 9 and we fail to get a shell for adb shell. At least it compiles without errors. Change-Id: I286be8628defb60cc527b8a548c0bdfcb0ebb574 --- twrpTar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'twrpTar.cpp') diff --git a/twrpTar.cpp b/twrpTar.cpp index 28ac91ac1..b5d66d31b 100644 --- a/twrpTar.cpp +++ b/twrpTar.cpp @@ -300,7 +300,7 @@ int twrpTar::createTarFork(const unsigned long long *overall_size, const unsigne _exit(-1); } else { LOGINFO("Joined thread %i.\n", i); - ret = (int)thread_return; + ret = *((int *)thread_return); if (ret != 0) { thread_error = 1; LOGERR("Thread %i returned an error %i.\n", i, ret); @@ -532,7 +532,7 @@ int twrpTar::extractTarFork(const unsigned long long *overall_size, unsigned lon _exit(-1); } else { LOGINFO("Joined thread %i.\n", i); - ret = (int)thread_return; + ret = *((int *)thread_return); if (ret != 0) { thread_error = 1; LOGERR("Thread %i returned an error %i.\n", i, ret); @@ -751,7 +751,7 @@ int twrpTar::tarList(std::vector *TarList, unsigned thread_id) { LOGERR("Error closing '%s' on thread %i\n", tarfn.c_str(), thread_id); return -3; } - LOGINFO("Thread id %i tarList done, %i archives.\n", thread_id, archive_count, i, list_size); + LOGINFO("Thread id %i tarList done, %i archives.\n", thread_id, archive_count); return 0; } -- cgit v1.2.3