[CRIU] [PATCH 3/4] Fix ZDTM AArch64 build failures

[Christopher Covington]

Signed-off-by: Christopher Covington <cov at codeaurora.org>
---
 test/zdtm/live/static/Makefile      | 2 +-
 test/zdtm/live/transition/maps007.c | 2 +-
 test/zdtm/live/transition/ptrace.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index 7073724..37e6edb 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -301,7 +301,7 @@ criu-rtc.pb-c.c: criu-rtc.proto
 	protoc-c --proto_path=. --c_out=. criu-rtc.proto
 
 criu-rtc.so: criu-rtc.c criu-rtc.pb-c.c
-	gcc -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../../include -fPIC $(USERCFLAGS)
+	$(CC) -g -Wall -shared -nostartfiles criu-rtc.c criu-rtc.pb-c.c -o criu-rtc.so -iquote ../../../../include -fPIC $(USERCFLAGS)
 
 .PHONY:	force clean cleandep cleanout realclean start check_start stop wait_stop
 
diff --git a/test/zdtm/live/transition/maps007.c b/test/zdtm/live/transition/maps007.c
index 75164ee..a5788c3 100644
--- a/test/zdtm/live/transition/maps007.c
+++ b/test/zdtm/live/transition/maps007.c
@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 			if (!futex_get(&shm->stop))
 				futex_wait_while_lt(&shm->delta, MAX_DELTA);
 
-			if (futex_get(&shm->stop) && atomic_get(&shm->delta) == MAX_DELTA)
+			if (futex_get(&shm->stop) && atomic_get(&shm->delta.raw) == MAX_DELTA)
 				break;
 			futex_dec_and_wake(&shm->delta);
 		}
diff --git a/test/zdtm/live/transition/ptrace.c b/test/zdtm/live/transition/ptrace.c
index 51d15df..2c04997 100644
--- a/test/zdtm/live/transition/ptrace.c
+++ b/test/zdtm/live/transition/ptrace.c
@@ -94,7 +94,7 @@ out_th:
 		}
 
 		if (WIFSTOPPED(status)) {
-			if (ptrace(PTRACE_GETREGS, stopped, NULL, regs)) {
+			if (ptrace(PTRACE_GETSIGINFO, stopped, NULL, regs)) {
 				/* FAIL */
 				fail("Ptrace won't work");
 				break;
-- 
Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by the Linux Foundation.