From f20eec61ad1019d6417a8d5b42edfdab74211704 Mon Sep 17 00:00:00 2001
From: Yann Collet <yann.collet.73@gmail.com>
Date: Sat, 3 May 2025 15:56:44 -0700
Subject: [PATCH] added fuzzer target

now handle by multiconf.make
---
 Makefile      | 15 ++++++++-------
 fuzz/fuzzer.c |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 756a284..fa98a3b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@ LIBVER_MINOR := $(shell echo $(LIBVER_MINOR_SCRIPT))
 LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT))
 LIBVER := $(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
 
+MAKEFLAGS += --no-print-directory
 CFLAGS ?= -O3
 DEBUGFLAGS+=-Wall -Wextra -Wconversion -Wcast-qual -Wcast-align -Wshadow \
             -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
@@ -95,7 +96,7 @@ XXHSUM_OBJS = $(XXHSUM_SRCS_FLAT:.c=.o)
 default: DEBUGFLAGS=
 default: lib xxhsum_and_links
 
-C_SRCDIRS = . $(XXHSUM_SRC_DIR)
+C_SRCDIRS = . $(XXHSUM_SRC_DIR) fuzz
 include build/make/multiconf.make
 
 .PHONY: all
@@ -177,8 +178,6 @@ clean: clean_cache
 	$(RM) core *.o *.obj *.$(SHARED_EXT) *.$(SHARED_EXT).* *.a libxxhash.pc
 	$(RM) xxhsum.wasm xxhsum.js xxhsum.html
 	$(RM) xxh32sum$(EXT) xxh64sum$(EXT) xxh128sum$(EXT) xxh3sum$(EXT)
-	$(RM) fuzzer
-	$(RM) $(XXHSUM_SRC_DIR)/*.o $(XXHSUM_SRC_DIR)/*.obj
 	$(MAKE) -C tests clean
 	$(MAKE) -C tests/bench clean
 	$(MAKE) -C tests/collisions clean
@@ -315,11 +314,13 @@ test-xxhsum-c: xxhsum
 	cat .test.filenames | $(RUN_ENV) ./xxhsum$(EXT) --filelist
 	@$(RM) .test.*
 
-LIB_FUZZING_ENGINE?="-fsanitize=fuzzer"
-CC_VERSION := $(shell $(CC) --version)
+CC_VERSION := $(shell $(CC) --version 2>/dev/null)
 ifneq (,$(findstring clang,$(CC_VERSION)))
-fuzzer: libxxhash.a fuzz/fuzzer.c
-	$(CC) $(CFLAGS) $(LIB_FUZZING_ENGINE) -I. -o fuzzer fuzz/fuzzer.c -L. -Wl,-Bstatic -lxxhash -Wl,-Bdynamic
+fuzzer: CFLAGS += -fsanitize=fuzzer
+fuzzer: LDFLAGS += -L. -Wl,-Bstatic -lxxhash -Wl,-Bdynamic
+$(eval $(call c_program,fuzzer, fuzzer.o xxhash.o))
+else
+fuzzer: this_target_requires_clang # intentional fail
 endif
 
 .PHONY: test-filename-escape
diff --git a/fuzz/fuzzer.c b/fuzz/fuzzer.c
index 731ba4d..906853a 100644
--- a/fuzz/fuzzer.c
+++ b/fuzz/fuzzer.c
@@ -4,8 +4,8 @@
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
   volatile XXH64_hash_t hash64 = XXH64(data, size, 0);
-  (void)hash64;
   volatile XXH32_hash_t hash32 = XXH32(data, size, 0);
+  (void)hash64;
   (void)hash32;
   return 0;
 }