From: Michael Buesch <mb@bu3sch.de>
Date: Sat, 24 May 2008 18:24:55 +0000 (+0200)
Subject: b43-asm: Only warning, not error, on RET after JMP
X-Git-Tag: b43-fwcutter-013~49
X-Git-Url: https://jxself.org/git/?p=b43-tools.git;a=commitdiff_plain;h=0d23a756ee29394d72a9b74002c1659b4ceecda2

b43-asm: Only warning, not error, on RET after JMP

Sometimes it's valid to have a RET after a JMP

Signed-off-by: Michael Buesch <mb@bu3sch.de>
---

diff --git a/assembler/main.c b/assembler/main.c
index ab79f7e..54252da 100644
--- a/assembler/main.c
+++ b/assembler/main.c
@@ -823,8 +823,8 @@ static void assemble_instruction(struct assembler_context *ctx,
 			/* Search the last insn. */
 			if (out->type == OUT_INSN) {
 				if (out->is_jump_insn) {
-					asm_error(ctx, "RET instruction directly after "
-						  "jump instruction. The hardware won't like this.");
+					asm_warn(ctx, "RET instruction directly after "
+						 "jump instruction. The hardware won't like this.");
 				}
 				break;
 			}
diff --git a/assembler/selftest.sh b/assembler/selftest.sh
index 7f2f0c5..99dbf17 100755
--- a/assembler/selftest.sh
+++ b/assembler/selftest.sh
@@ -72,6 +72,6 @@ if [ "$orig_sum" != "$out_sum" ]; then
 	echo "FAILURE: Checksums don't match!"
 	exit 1
 fi
-echo "Everything is OK"
+echo "Checksums match"
 
 exit 0