Adding upstream version 18.2.2.upstream/18.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

6 files changed, 98 insertions, 0 deletions

diff --git a/src/spdk/dpdk/mk/exec-env/bsdapp b/src/spdk/dpdk/mk/exec-env/bsdapp
new file mode 120000
index 000000000..69f5cba2c
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/bsdapp
@@ -0,0 +1 @@
+freebsd/
\ No newline at end of file
diff --git a/src/spdk/dpdk/mk/exec-env/freebsd/rte.app.mk b/src/spdk/dpdk/mk/exec-env/freebsd/rte.app.mk
new file mode 100644
index 000000000..a2af7266a
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/freebsd/rte.app.mk
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+
+exec-env-appinstall:
+	@true
+
+exec-env-appclean:
+	@true
diff --git a/src/spdk/dpdk/mk/exec-env/freebsd/rte.vars.mk b/src/spdk/dpdk/mk/exec-env/freebsd/rte.vars.mk
new file mode 100644
index 000000000..630eb55f7
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/freebsd/rte.vars.mk
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2019 Intel Corporation
+
+#
+# exec-env:
+#
+#   - define EXECENV_CFLAGS variable (overridden by cmdline)
+#   - define EXECENV_LDFLAGS variable (overridden by cmdline)
+#   - define EXECENV_ASFLAGS variable (overridden by cmdline)
+#   - may override any previously defined variable
+#
+# examples for RTE_EXEC_ENV: linux, freebsd
+#
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+EXECENV_CFLAGS  = -pthread -fPIC
+else
+EXECENV_CFLAGS  = -pthread
+endif
+
+# include in every library to build
+EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/freebsd/include
+
+EXECENV_LDFLAGS =
+EXECENV_LDLIBS  = -lexecinfo
+EXECENV_ASFLAGS =
+
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+EXECENV_LDLIBS += -lgcc_s
+endif
+
+# force applications to link with gcc/icc instead of using ld
+LINK_USING_CC := 1
+
+BSDMAKE=/usr/bin/make
+
+export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS
diff --git a/src/spdk/dpdk/mk/exec-env/linux/rte.app.mk b/src/spdk/dpdk/mk/exec-env/linux/rte.app.mk
new file mode 100644
index 000000000..a2af7266a
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/linux/rte.app.mk
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
+
+exec-env-appinstall:
+	@true
+
+exec-env-appclean:
+	@true
diff --git a/src/spdk/dpdk/mk/exec-env/linux/rte.vars.mk b/src/spdk/dpdk/mk/exec-env/linux/rte.vars.mk
new file mode 100644
index 000000000..41ef4195b
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/linux/rte.vars.mk
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2019 Intel Corporation
+
+#
+# exec-env:
+#
+#   - define EXECENV_CFLAGS variable (overridden by cmdline)
+#   - define EXECENV_LDFLAGS variable (overridden by cmdline)
+#   - define EXECENV_ASFLAGS variable (overridden by cmdline)
+#   - may override any previously defined variable
+#
+# examples for RTE_EXEC_ENV: linux, freebsd
+#
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+EXECENV_CFLAGS  = -pthread -fPIC
+else
+EXECENV_CFLAGS  = -pthread
+endif
+
+# include in every library to build
+EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/include
+
+EXECENV_LDLIBS  =
+EXECENV_ASFLAGS =
+
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+EXECENV_LDLIBS += -lgcc_s
+endif
+
+EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd
+
+# force applications to link with gcc/icc instead of using ld
+LINK_USING_CC := 1
+
+# For shared libraries
+EXECENV_LDFLAGS += -export-dynamic
+# Add library to the group to resolve symbols
+EXECENV_LDLIBS  += -ldl
+
+# EXECENV_LDLIBS-y applies to lib.so and app linking
+# while EXECENV_LDLIBS applies only to app linking.
+EXECENV_LDLIBS += $(EXECENV_LDLIBS-y)
+
+export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS
diff --git a/src/spdk/dpdk/mk/exec-env/linuxapp b/src/spdk/dpdk/mk/exec-env/linuxapp
new file mode 120000
index 000000000..ce5e2c77b
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/linuxapp
@@ -0,0 +1 @@
+linux/
\ No newline at end of file