fix(clang15): fix check_eret_speculation_barrier
Update check_eret_speculation_barrier to be agnostic to
endianness and spacing discrepancies between different
clang objdump versions.
Signed-off-by: Kathleen Capella <kathleen.capella@arm.com>
Change-Id: Ic56ff1c12d4914d6fd3186873dadfcf52feef204
diff --git a/build/image/check_elf.py b/build/image/check_elf.py
index 6394cb1..35b27e7 100644
--- a/build/image/check_elf.py
+++ b/build/image/check_elf.py
@@ -29,7 +29,7 @@
"""
objdump_stdout = subprocess\
- .check_output([ OBJDUMP, "-d", args.input_elf ])\
+ .check_output([ OBJDUMP, "--no-show-raw-insn", "-d", args.input_elf ])\
.decode("utf-8")\
.splitlines()
@@ -39,9 +39,9 @@
STATE_EXPECT_DSB_NSH = 2
STATE_EXPECT_ISB = 3
- REGEX_ERET = re.compile(r"^\s*[0-9a-f]+:\s*e0 03 9f d6\s+eret$")
- REGEX_DSB_NSH = re.compile(r"^\s*[0-9a-f]+:\s*9f 37 03 d5\s*dsb\s+nsh$")
- REGEX_ISB = re.compile(r"^\s*[0-9a-f]+:\s*df 3f 03 d5\s+isb$")
+ REGEX_ERET = re.compile(r"^\s*[0-9a-f]+:\s*eret$")
+ REGEX_DSB_NSH = re.compile(r"^\s*[0-9a-f]+:\s*dsb\s+nsh$")
+ REGEX_ISB = re.compile(r"^\s*[0-9a-f]+:\s*isb$")
state = STATE_DEFAULT
for line in objdump_stdout: