From 1774c4b8127a36e5974c2326b0495836172dfc25 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 12 Jul 2019 15:30:08 -0400
Subject: [PATCH] fixed arm64 bug
---
cicd_testing/do-gather-bins.sh | 2 +-
irdb-libs/ir_builders/fill_in_indtargs.cpp | 2 +-
zipr | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cicd_testing/do-gather-bins.sh b/cicd_testing/do-gather-bins.sh
index ea9a9e4f2..a92cedfc0 100755
--- a/cicd_testing/do-gather-bins.sh
+++ b/cicd_testing/do-gather-bins.sh
@@ -6,5 +6,5 @@ set -e
mkdir -p artifacts/test_binaries/
cp $(which ls) artifacts/test_binaries/ls.$(uname -m)
-cp $(which bzip2) artifacts/test_binaries/ls.$(uname -m)
+cp $(which bzip2) artifacts/test_binaries/bzip2.$(uname -m)
ls
diff --git a/irdb-libs/ir_builders/fill_in_indtargs.cpp b/irdb-libs/ir_builders/fill_in_indtargs.cpp
index 4e085d55a..b13d9c222 100644
--- a/irdb-libs/ir_builders/fill_in_indtargs.cpp
+++ b/irdb-libs/ir_builders/fill_in_indtargs.cpp
@@ -3272,7 +3272,7 @@ void unpin_elf_tables(FileIR_t *firp, int64_t do_unpin_opt)
auto insn=lookupInstruction(firp,vo);
// OK for .got scoop to miss, some entries are empty.
- if(scoop->getName()==".got" && insn==nullptr)
+ if(scoop->getName()==".got" && (vo==0 || insn==nullptr))
{
if(getenv("UNPIN_VERBOSE")!=0)
cout<<"Skipping "<<scoop->getName()<<" unpin for "<<hex<<vo<<" due to no instruction at vo"<<endl;
diff --git a/zipr b/zipr
index 90b4041d3..649ee3103 160000
--- a/zipr
+++ b/zipr
@@ -1 +1 @@
-Subproject commit 90b4041d328482923a545730702619d30b72165a
+Subproject commit 649ee3103270dc4abf3dc890afec28e12aaa5900
--
GitLab