mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 12:44:11 +08:00
bf48d9b756
Commit 54b8ae66ae ("kbuild: change *FLAGS_<basetarget>.o to take the
path relative to $(obj)") changed the syntax of per-file compiler flags.
The situation is the same for the following variables:
OBJECT_FILES_NON_STANDARD_<basetarget>.o
GCOV_PROFILE_<basetarget>.o
KASAN_SANITIZE_<basetarget>.o
KMSAN_SANITIZE_<basetarget>.o
KMSAN_ENABLE_CHECKS_<basetarget>.o
UBSAN_SANITIZE_<basetarget>.o
KCOV_INSTRUMENT_<basetarget>.o
KCSAN_SANITIZE_<basetarget>.o
KCSAN_INSTRUMENT_BARRIERS_<basetarget>.o
The <basetarget> is the filename of the target with its directory and
suffix stripped.
This syntax comes into a trouble when two files with the same basename
appear in one Makefile, for example:
obj-y += dir1/foo.o
obj-y += dir2/foo.o
OBJECT_FILES_NON_STANDARD_foo.o := y
OBJECT_FILES_NON_STANDARD_foo.o is applied to both dir1/foo.o and
dir2/foo.o. This syntax is not flexbile enough to handle cases where
one of them is a standard object, but the other is not.
It is more sensible to use the relative path to the Makefile, like this:
obj-y += dir1/foo.o
OBJECT_FILES_NON_STANDARD_dir1/foo.o := y
obj-y += dir2/foo.o
OBJECT_FILES_NON_STANDARD_dir2/foo.o := y
To maintain the current behavior, I made adjustments to the following two
Makefiles:
- arch/x86/entry/vdso/Makefile, which compiles vclock_gettime.o, vgetcpu.o,
and their vdso32 variants.
- arch/x86/kvm/Makefile, which compiles vmx/vmenter.o and svm/vmenter.o
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>
Acked-by: Sean Christopherson <seanjc@google.com>
54 lines
1.5 KiB
Makefile
54 lines
1.5 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
ccflags-y += -I $(srctree)/arch/x86/kvm
|
|
ccflags-$(CONFIG_KVM_WERROR) += -Werror
|
|
|
|
ifeq ($(CONFIG_FRAME_POINTER),y)
|
|
OBJECT_FILES_NON_STANDARD_vmx/vmenter.o := y
|
|
OBJECT_FILES_NON_STANDARD_svm/vmenter.o := y
|
|
endif
|
|
|
|
include $(srctree)/virt/kvm/Makefile.kvm
|
|
|
|
kvm-y += x86.o emulate.o i8259.o irq.o lapic.o \
|
|
i8254.o ioapic.o irq_comm.o cpuid.o pmu.o mtrr.o \
|
|
debugfs.o mmu/mmu.o mmu/page_track.o \
|
|
mmu/spte.o
|
|
|
|
kvm-$(CONFIG_X86_64) += mmu/tdp_iter.o mmu/tdp_mmu.o
|
|
kvm-$(CONFIG_KVM_HYPERV) += hyperv.o
|
|
kvm-$(CONFIG_KVM_XEN) += xen.o
|
|
kvm-$(CONFIG_KVM_SMM) += smm.o
|
|
|
|
kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \
|
|
vmx/nested.o vmx/posted_intr.o
|
|
|
|
kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o
|
|
kvm-intel-$(CONFIG_KVM_HYPERV) += vmx/hyperv.o vmx/hyperv_evmcs.o
|
|
|
|
kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o \
|
|
svm/sev.o
|
|
kvm-amd-$(CONFIG_KVM_HYPERV) += svm/hyperv.o
|
|
|
|
ifdef CONFIG_HYPERV
|
|
kvm-y += kvm_onhyperv.o
|
|
kvm-intel-y += vmx/vmx_onhyperv.o vmx/hyperv_evmcs.o
|
|
kvm-amd-y += svm/svm_onhyperv.o
|
|
endif
|
|
|
|
obj-$(CONFIG_KVM) += kvm.o
|
|
obj-$(CONFIG_KVM_INTEL) += kvm-intel.o
|
|
obj-$(CONFIG_KVM_AMD) += kvm-amd.o
|
|
|
|
AFLAGS_svm/vmenter.o := -iquote $(obj)
|
|
$(obj)/svm/vmenter.o: $(obj)/kvm-asm-offsets.h
|
|
|
|
AFLAGS_vmx/vmenter.o := -iquote $(obj)
|
|
$(obj)/vmx/vmenter.o: $(obj)/kvm-asm-offsets.h
|
|
|
|
$(obj)/kvm-asm-offsets.h: $(obj)/kvm-asm-offsets.s FORCE
|
|
$(call filechk,offsets,__KVM_ASM_OFFSETS_H__)
|
|
|
|
targets += kvm-asm-offsets.s
|
|
clean-files += kvm-asm-offsets.h
|