Merge tag 'objtool_urgent_for_v6.1_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool fix from Borislav Petkov:

- Handle different output of readelf on different distros running
ppc64le which confuses faddr2line's function offsets conversion

* tag 'objtool_urgent_for_v6.1_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
scripts/faddr2line: Fix regression in name resolution on ppc64le

Changed files
+4 -3
scripts
+4 -3
scripts/faddr2line
··· 74 74 find_dir_prefix() { 75 75 local objfile=$1 76 76 77 - local start_kernel_addr=$(${READELF} --symbols --wide $objfile | ${AWK} '$8 == "start_kernel" {printf "0x%s", $2}') 77 + local start_kernel_addr=$(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | 78 + ${AWK} '$8 == "start_kernel" {printf "0x%s", $2}') 78 79 [[ -z $start_kernel_addr ]] && return 79 80 80 81 local file_line=$(${ADDR2LINE} -e $objfile $start_kernel_addr) ··· 179 178 found=2 180 179 break 181 180 fi 182 - done < <(${READELF} --symbols --wide $objfile | ${AWK} -v sec=$sym_sec '$7 == sec' | sort --key=2) 181 + done < <(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | ${AWK} -v sec=$sym_sec '$7 == sec' | sort --key=2) 183 182 184 183 if [[ $found = 0 ]]; then 185 184 warn "can't find symbol: sym_name: $sym_name sym_sec: $sym_sec sym_addr: $sym_addr sym_elf_size: $sym_elf_size" ··· 260 259 261 260 DONE=1 262 261 263 - done < <(${READELF} --symbols --wide $objfile | ${AWK} -v fn=$sym_name '$4 == "FUNC" && $8 == fn') 262 + done < <(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | ${AWK} -v fn=$sym_name '$4 == "FUNC" && $8 == fn') 264 263 } 265 264 266 265 [[ $# -lt 2 ]] && usage