From f9c3b61884b0a3ae65b5b2af3f4937d1a06c3252 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Wed, 6 Jan 2021 02:13:50 +0100
Subject: [PATCH] arm-asm-testsuite.sh: Prefer current tcc as specified in
 $(TCC)

---
 tests/Makefile             | 2 +-
 tests/arm-asm-testsuite.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index c79d7ca4..ec479c5c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -225,7 +225,7 @@ asmtest.ref: asmtest.S
 
 ifeq ($(ARCH),arm)
 asmtest asmtest2:
-	(cd .. && tests/arm-asm-testsuite.sh)
+	TCC="${TCC}" ./arm-asm-testsuite.sh
 else
 asmtest asmtest2: asmtest.ref
 	@echo ------------ $@ ------------
diff --git a/tests/arm-asm-testsuite.sh b/tests/arm-asm-testsuite.sh
index 89a8379b..273111b3 100755
--- a/tests/arm-asm-testsuite.sh
+++ b/tests/arm-asm-testsuite.sh
@@ -5,7 +5,7 @@ set -e
 # Note: "{r3}" is definitely different--but would complicate the assembler.
 
 state="`mktemp -d`"
-cat arm-tok.h |grep DEF_ASM_CONDED |grep -v '#define' |grep -v '/[*]' |sed -e 's;DEF_ASM_CONDED.\(.*\).$;\1;'| grep -v 'not useful' | while read s
+cat ../arm-tok.h |grep DEF_ASM_CONDED |grep -v '#define' |grep -v '/[*]' |sed -e 's;DEF_ASM_CONDED.\(.*\).$;\1;'| grep -v 'not useful' | while read s
 do
 	ok=0
 	for args in "r3, r4, r5, r6" \
@@ -92,7 +92,7 @@ do
 			"${CROSS_COMPILE}objdump" -S "${as_object}" |grep "^[ ]*0:" >"${expected}"
 
 			#echo '__asm__("'"$s ${args}"'");' > "${csource}"
-			if echo '__asm__("'"$s ${args}"'");'| ./tcc -o "${tcc_object}" -c -
+			if echo '__asm__("'"$s ${args}"'");'| ${TCC} -o "${tcc_object}" -c -
 			then
 				"${CROSS_COMPILE}objdump" -S "${tcc_object}" |grep "^[ ]*0:" >"${got}"
 				if diff -u "${got}" "${expected}"