Merge 5.10.151 into android12-5.10-lts

Changes in 5.10.151
	bpf: Generate BTF_KIND_FLOAT when linking vmlinux
	kbuild: Quote OBJCOPY var to avoid a pahole call break the build
	kbuild: skip per-CPU BTF generation for pahole v1.18-v1.21
	kbuild: Unify options for BTF generation for vmlinux and modules
	kbuild: Add skip_encoding_btf_enum64 option to pahole
	Linux 5.10.151

Change-Id: I9933085e5146688af0c7ebae2708c1c978100a90
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2022-11-16 15:33:22 +00:00
3 changed files with 26 additions and 2 deletions

View File

@@ -234,7 +234,7 @@ gen_btf()
vmlinux_link ${1}
info "BTF" ${2}
LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1}
LLVM_OBJCOPY="${OBJCOPY}" ${PAHOLE} -J ${PAHOLE_FLAGS} ${1}
# Create ${2} which contains just .BTF section but no symbols. Add
# SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all