Use tsearch from naive-tsearch

kulp · kulp · commit f8b0cf72a598 · 2020-08-24T20:29:31.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "3rdparty/wb_intercon"]
 	path = 3rdparty/wb_intercon
 	url = https://github.com/olofk/wb_intercon.git
+[submodule "3rdparty/naive-tsearch"]
+	path = 3rdparty/naive-tsearch
+	url = https://github.com/kulp/naive-tsearch.git
diff --git a/3rdparty/naive-tsearch b/3rdparty/naive-tsearch
@@ -0,0 +1 @@
+Subproject commit 11cb6ea3a86639bdc833fc8f39b9a08e75f58bc8
diff --git a/Makefile b/Makefile
@@ -36,8 +36,11 @@ tsim_OBJECTS   = $(common_OBJECTS) simif.o asm.o obj.o plugin.o \
 tld_OBJECTS    = $(common_OBJECTS) obj.o
 
 ifeq ($(USE_OWN_SEARCH),1)
+vpath %.c $(TOP)/3rdparty/naive-tsearch
 # The interface of lsearch and tsearch is not something we can change.
 lsearch.o tsearch.o: CFLAGS += -W$(PEDANTRY_EXCEPTION)cast-qual
+# tsearch.o from naive-tsearch has feature flags
+tsearch.o: CFLAGS += -Wno-unused-macros
 
 tas_OBJECTS   += lsearch.o tsearch.o
 tld_OBJECTS   += lsearch.o tsearch.o
diff --git a/src/tsearch.c b/src/tsearch.c
