From 04248bc540f24527f5a9805737f5d732927d718d Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 30 Jun 2026 09:43:45 +0200 Subject: [PATCH] x86: sort obj-<...> list of main Makefile It is mostly sorted, but there are anomalies. Eliminating them gives people fewer excuses to (blindly) add to the end of the list. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index c4c38516a7..1474b2121e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -33,21 +33,22 @@ obj-y += emul-i8254.o obj-y += extable.o obj-y += flushtlb.o obj-$(CONFIG_GDBSX) += gdbsx.o +obj-y += hpet.o obj-y += hypercall.o obj-y += i387.o obj-y += i8259.o -obj-y += io_apic.o -obj-$(CONFIG_LIVEPATCH) += livepatch.o -obj-y += msi.o -obj-y += msr.o obj-$(CONFIG_INDIRECT_THUNK) += indirect-thunk.o obj-$(CONFIG_RETURN_THUNK) += indirect-thunk.o obj-$(CONFIG_PV) += ioport_emulate.o +obj-y += io_apic.o obj-y += irq.o +obj-$(CONFIG_LIVEPATCH) += livepatch.o obj-$(CONFIG_KEXEC) += machine_kexec.o obj-y += mm.o x86_64/mm.o obj-$(CONFIG_VM_EVENT) += monitor.o obj-y += mpparse.o +obj-y += msi.o +obj-y += msr.o obj-y += nmi.o obj-y += numa.o obj-y += pci.o @@ -62,14 +63,13 @@ obj-y += spec_ctrl.o obj-y += srat.o obj-y += string.o obj-$(CONFIG_SYSCTL) += sysctl.o +obj-$(CONFIG_TBOOT) += tboot.o obj-y += time.o obj-y += traps-setup.o obj-y += traps.o obj-$(CONFIG_INTEL) += tsx.o -obj-y += x86_emulate.o -obj-$(CONFIG_TBOOT) += tboot.o -obj-y += hpet.o obj-$(CONFIG_VM_EVENT) += vm_event.o +obj-y += x86_emulate.o obj-y += xstate.o ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y)