[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.17] lib{fdt,elf}: move lib{fdt,elf}-temp.o and their deps to $(targets)
commit afb85cf1e8f165abf88de9d8a6df625692a753b1 Author: Michal Orzel <michal.orzel@xxxxxxx> AuthorDate: Fri Feb 2 08:04:07 2024 +0100 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Fri Feb 2 08:04:07 2024 +0100 lib{fdt,elf}: move lib{fdt,elf}-temp.o and their deps to $(targets) At the moment, trying to run xencov read/reset (calling SYSCTL_coverage_op under the hood) results in a crash. This is due to a profiler trying to access data in the .init.* sections (libfdt for Arm and libelf for x86) that are stripped after boot. Normally, the build system compiles any *.init.o file without COV_FLAGS. However, these two libraries are handled differently as sections will be renamed to init after linking. To override COV_FLAGS to empty for these libraries, lib{fdt,elf}.o were added to nocov-y. This worked until e321576f4047 ("xen/build: start using if_changed") that added lib{fdt,elf}-temp.o and their deps to extra-y. This way, even though these objects appear as prerequisites of lib{fdt,elf}.o and the settings should propagate to them, make can also build them as a prerequisite of __build, in which case COV_FLAGS would still have the unwanted flags. Fix it by switching to $(targets) instead. Also, for libfdt, append libfdt.o to nocov-y only if CONFIG_OVERLAY_DTB is not set. Otherwise, there is no section renaming and we should be able to run the coverage. Fixes: e321576f4047 ("xen/build: start using if_changed") Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx> Reviewed-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> Acked-by: Jan Beulich <jbeulich@xxxxxxxx> master commit: 79519fcfa0605bbf19d8c02b979af3a2c8afed68 master date: 2024-01-23 12:02:44 +0100 --- xen/common/libelf/Makefile | 2 +- xen/common/libfdt/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/libelf/Makefile b/xen/common/libelf/Makefile index 8a4522e4e1..917d12b006 100644 --- a/xen/common/libelf/Makefile +++ b/xen/common/libelf/Makefile @@ -13,4 +13,4 @@ $(obj)/libelf.o: $(obj)/libelf-temp.o FORCE $(obj)/libelf-temp.o: $(addprefix $(obj)/,$(libelf-objs)) FORCE $(call if_changed,ld) -extra-y += libelf-temp.o $(libelf-objs) +targets += libelf-temp.o $(libelf-objs) diff --git a/xen/common/libfdt/Makefile b/xen/common/libfdt/Makefile index 75aaefa2e3..4d14fd61ba 100644 --- a/xen/common/libfdt/Makefile +++ b/xen/common/libfdt/Makefile @@ -2,9 +2,9 @@ include $(src)/Makefile.libfdt SECTIONS := text data $(SPECIAL_DATA_SECTIONS) OBJCOPYFLAGS := $(foreach s,$(SECTIONS),--rename-section .$(s)=.init.$(s)) +nocov-y += libfdt.o obj-y += libfdt.o -nocov-y += libfdt.o CFLAGS-y += -I$(srctree)/include/xen/libfdt/ @@ -14,4 +14,4 @@ $(obj)/libfdt.o: $(obj)/libfdt-temp.o FORCE $(obj)/libfdt-temp.o: $(addprefix $(obj)/,$(LIBFDT_OBJS)) FORCE $(call if_changed,ld) -extra-y += libfdt-temp.o $(LIBFDT_OBJS) +targets += libfdt-temp.o $(LIBFDT_OBJS) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.17
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |