Index: utils/UpdateTestChecks/asm.py =================================================================== --- utils/UpdateTestChecks/asm.py +++ utils/UpdateTestChecks/asm.py @@ -50,6 +50,18 @@ # .Lfunc_end0: (mips64 - NewABI) flags=(re.M | re.S)) +ASM_FUNCTION_PPC_BE_RE = re.compile( + r'^_?(?P[^:]+):[ \t]*#+[ \t]*@(?P=func)\n' + r'.*?\n[ \t]+.text\n' + r'\.Lfunc_begin[0-9]+:\n' + r'(?:[ \t]+.cfi_startproc\n)?' + r'(?:\.Lfunc_[gl]ep[0-9]+:\n(?:[ \t]+.*?\n)*)*' + r'(?P.*?)\n' + # This list is incomplete + r'(?:^[ \t]*(?:\.long[ \t]+[^\n]+|\.quad[ \t]+[^\n]+)\n)*' + r'.Lfunc_end[0-9]+:\n', + flags=(re.M | re.S)) + ASM_FUNCTION_PPC_RE = re.compile( r'^_?(?P[^:]+):[ \t]*#+[ \t]*@(?P=func)\n' r'\.Lfunc_begin[0-9]+:\n' @@ -230,8 +242,9 @@ 'armv7eb-eabi': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'armv7eb': (scrub_asm_arm_eabi, ASM_FUNCTION_ARM_RE), 'mips': (scrub_asm_mips, ASM_FUNCTION_MIPS_RE), - 'powerpc64': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_RE), - 'powerpc64le': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_RE), +# Including the dashes in the triple so PPC BE does not subsume LE. + 'powerpc64-': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_BE_RE), + 'powerpc64le-': (scrub_asm_powerpc64, ASM_FUNCTION_PPC_RE), 'riscv32': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE), 'riscv64': (scrub_asm_riscv, ASM_FUNCTION_RISCV_RE), 'sparc': (scrub_asm_sparc, ASM_FUNCTION_SPARC_RE),