From 8668141b41ae5edb41063a9eecf4da9ff87ebcda Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Sun, 10 May 2020 13:31:11 -0700 Subject: [PATCH] make: remove spdk.map. As of now, all of the libraries and modules have their own map file specified. Get rid of the generic top level one and add a test to make sure that these files have been specified. Signed-off-by: Seth Howell Change-Id: I329004e7442c7975731fc973455c93e724982952 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2359 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Darek Stojaczyk --- lib/ut_mock/Makefile | 2 ++ mk/spdk.lib.mk | 2 +- shared_lib/spdk.map | 12 ------------ 3 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 shared_lib/spdk.map diff --git a/lib/ut_mock/Makefile b/lib/ut_mock/Makefile index 178dfb352..734237cd9 100644 --- a/lib/ut_mock/Makefile +++ b/lib/ut_mock/Makefile @@ -41,4 +41,6 @@ SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = mock.c LIBNAME = ut_mock +SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/mk/spdk_blank.map + include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk index 8eea018d9..b01e4b16b 100644 --- a/mk/spdk.lib.mk +++ b/mk/spdk.lib.mk @@ -35,7 +35,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.lib_deps.mk ifeq ($(SPDK_MAP_FILE),) -SPDK_MAP_FILE = $(SPDK_ROOT_DIR)/shared_lib/spdk.map +$(error SPDK_MAP_FILE is not set for lib $(LIBNAME)) endif LIB := $(call spdk_lib_list_to_static_libs,$(LIBNAME)) diff --git a/shared_lib/spdk.map b/shared_lib/spdk.map deleted file mode 100644 index ecc9119ff..000000000 --- a/shared_lib/spdk.map +++ /dev/null @@ -1,12 +0,0 @@ -{ - global: - - spdk_*; - rte_vhost_*; - virt*; - SPDK_LOG*; - _spdk_trace_record; - g_trace_histories; - - local: *; -};