update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / spdk / mk / spdk.app.mk

diff --git a/ceph/src/spdk/mk/spdk.app.mk b/ceph/src/spdk/mk/spdk.app.mk
index 5ae15f80d0105a3b8da9bd869b81f289dc7cdca7..92a2ce100b3ab3dbfcd55e63246684c207d0f5fe 100644 (file)
--- a/ceph/src/spdk/mk/spdk.app.mk
+++ b/ceph/src/spdk/mk/spdk.app.mk
@@ -31,24 +31,45 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+# Event subsystems only export constructor functions, so wrap these
+# in whole-archive linker args
+SPDK_FILTER_LIB_LIST = $(filter event_%,$(SPDK_LIB_LIST))
+
 # RPC libraries only export constructor functions, so these need to be treated
 #  separately and wrapped in whole-archive linker args
-SPDK_RPC_LIB_LIST = $(filter %_rpc,$(SPDK_LIB_LIST))
+SPDK_FILTER_LIB_LIST += $(filter %_rpc,$(SPDK_LIB_LIST))
 
 # Currently some libraries contain their respective RPC methods
 #  rather than breaking them out into separate libraries.  So we must also include
 #  these directories in the RPC library list.
-SPDK_RPC_LIB_LIST += $(filter iscsi,$(SPDK_LIB_LIST))
-SPDK_RPC_LIB_LIST += $(filter net,$(SPDK_LIB_LIST))
-SPDK_RPC_LIB_LIST += $(filter scsi,$(SPDK_LIB_LIST))
-SPDK_RPC_LIB_LIST += $(filter vhost,$(SPDK_LIB_LIST))
+SPDK_FILTER_LIB_LIST += $(filter iscsi,$(SPDK_LIB_LIST))
+SPDK_FILTER_LIB_LIST += $(filter nbd,$(SPDK_LIB_LIST))
+SPDK_FILTER_LIB_LIST += $(filter net,$(SPDK_LIB_LIST))
+SPDK_FILTER_LIB_LIST += $(filter vhost,$(SPDK_LIB_LIST))
+SPDK_FILTER_LIB_LIST += $(filter scsi,$(SPDK_LIB_LIST))
+
+# The unit test mock wrappers need to be wrapped in whole-archive so they don't get
+# automatically removed with LTO.
+SPDK_FILTER_LIB_LIST += $(filter spdk_mock,$(SPDK_LIB_LIST))
 
-SPDK_REMAINING_LIB_LIST = $(filter-out $(SPDK_RPC_LIB_LIST),$(SPDK_LIB_LIST))
+SPDK_WHOLE_ARCHIVE_LIB_LIST = $(SPDK_FILTER_LIB_LIST)
+SPDK_REMAINING_LIB_LIST = $(filter-out $(SPDK_WHOLE_ARCHIVE_LIB_LIST),$(SPDK_LIB_LIST))
 
-SPDK_LIB_FILES = $(call spdk_lib_list_to_files,$(SPDK_LIB_LIST))
+SPDK_LIB_FILES = $(call spdk_lib_list_to_static_libs,$(SPDK_LIB_LIST))
 SPDK_LIB_LINKER_ARGS = \
        -L$(SPDK_ROOT_DIR)/build/lib \
        -Wl,--whole-archive \
-       $(SPDK_RPC_LIB_LIST:%=-lspdk_%) \
+       $(SPDK_WHOLE_ARCHIVE_LIB_LIST:%=-lspdk_%) \
        -Wl,--no-whole-archive \
        $(SPDK_REMAINING_LIB_LIST:%=-lspdk_%)
+
+# This is primarily used for unit tests to ensure they link when shared library
+# build is enabled.  Shared libraries can't get their mock implementation from
+# the unit test file.
+SPDK_STATIC_LIB_LINKER_ARGS = \
+       -Wl,--whole-archive \
+       $(SPDK_WHOLE_ARCHIVE_LIB_LIST:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a) \
+       -Wl,--no-whole-archive \
+       $(SPDK_REMAINING_LIB_LIST:%=$(SPDK_ROOT_DIR)/build/lib/libspdk_%.a)
+
+install: all