fuzz: add target/fuzz makefile rules (6879a405) · Commits · SUMMER2020 / students / proj-2021291

Makefile

+14 −1

Original line number	Diff line number	Diff line
		@@ -454,7 +454,7 @@ config-host.h-timestamp: config-host.mak
		qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
		$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"GEN","$@")

		TARGET_DIRS_RULES := $(foreach t, all clean install, $(addsuffix /$(t), $(TARGET_DIRS)))
		TARGET_DIRS_RULES := $(foreach t, all fuzz clean install, $(addsuffix /$(t), $(TARGET_DIRS)))

		SOFTMMU_ALL_RULES=$(filter %-softmmu/all, $(TARGET_DIRS_RULES))
		$(SOFTMMU_ALL_RULES): $(authz-obj-y)
		@@ -465,6 +465,15 @@ $(SOFTMMU_ALL_RULES): $(io-obj-y)
		$(SOFTMMU_ALL_RULES): config-all-devices.mak
		$(SOFTMMU_ALL_RULES): $(edk2-decompressed)

		SOFTMMU_FUZZ_RULES=$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES))
		$(SOFTMMU_FUZZ_RULES): $(authz-obj-y)
		$(SOFTMMU_FUZZ_RULES): $(block-obj-y)
		$(SOFTMMU_FUZZ_RULES): $(chardev-obj-y)
		$(SOFTMMU_FUZZ_RULES): $(crypto-obj-y)
		$(SOFTMMU_FUZZ_RULES): $(io-obj-y)
		$(SOFTMMU_FUZZ_RULES): config-all-devices.mak
		$(SOFTMMU_FUZZ_RULES): $(edk2-decompressed)

		.PHONY: $(TARGET_DIRS_RULES)
		# The $(TARGET_DIRS_RULES) are of the form SUBDIR/GOAL, so that
		# $(dir $@) yields the sub-directory, and $(notdir $@) yields the sub-goal
		@@ -511,6 +520,9 @@ subdir-slirp: slirp/all
		$(filter %/all, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
		$(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY))

		$(filter %/fuzz, $(TARGET_DIRS_RULES)): libqemuutil.a $(common-obj-y) \
		$(qom-obj-y) $(crypto-user-obj-$(CONFIG_USER_ONLY))

		ROM_DIRS = $(addprefix pc-bios/, $(ROMS))
		ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS)))
		# Only keep -O and -g cflags
		@@ -520,6 +532,7 @@ $(ROM_DIRS_RULES):

		.PHONY: recurse-all recurse-clean recurse-install
		recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
		recurse-fuzz: $(addsuffix /fuzz, $(TARGET_DIRS) $(ROM_DIRS))
		recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
		recurse-install: $(addsuffix /install, $(TARGET_DIRS))
		$(addsuffix /install, $(TARGET_DIRS)): all

Makefile.target

+16 −0

Original line number	Diff line number	Diff line
		@@ -231,6 +231,22 @@ ifdef CONFIG_TRACE_SYSTEMTAP
		rm -f *.stp
		endif

		ifdef CONFIG_FUZZ
		include $(SRC_PATH)/tests/fuzz/Makefile.include
		include $(SRC_PATH)/tests/Makefile.include

		fuzz: fuzz-vars
		fuzz-vars: QEMU_CFLAGS := $(FUZZ_CFLAGS) $(QEMU_CFLAGS)
		fuzz-vars: QEMU_LDFLAGS := $(FUZZ_LDFLAGS) $(QEMU_LDFLAGS)
		fuzz-vars: $(QEMU_PROG_FUZZ)
		dummy := $(call unnest-vars,, fuzz-obj-y)


		$(QEMU_PROG_FUZZ): config-devices.mak $(all-obj-y) $(COMMON_LDADDS) $(fuzz-obj-y)
		$(call LINK, $(filter-out %.mak, $^))

		endif

		install: all
		ifneq ($(PROGS),)
		$(call install-prog,$(PROGS),$(DESTDIR)$(bindir))