Adding upstream version 14.2.21.upstream/14.2.21upstream

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

4 files changed, 84 insertions, 0 deletions

diff --git a/src/spdk/dpdk/mk/exec-env/bsdapp/rte.app.mk b/src/spdk/dpdk/mk/exec-env/bsdapp/rte.app.mk
new file mode 100644
index 00000000..a2af7266
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/bsdapp/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/bsdapp/rte.vars.mk b/src/spdk/dpdk/mk/exec-env/bsdapp/rte.vars.mk
new file mode 100644
index 00000000..cec08840
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/bsdapp/rte.vars.mk
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 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: linuxapp, bsdapp
+#
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+EXECENV_CFLAGS  = -pthread -fPIC
+else
+EXECENV_CFLAGS  = -pthread
+endif
+
+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/linuxapp/rte.app.mk b/src/spdk/dpdk/mk/exec-env/linuxapp/rte.app.mk
new file mode 100644
index 00000000..a2af7266
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/linuxapp/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/linuxapp/rte.vars.mk b/src/spdk/dpdk/mk/exec-env/linuxapp/rte.vars.mk
new file mode 100644
index 00000000..3129edc8
--- /dev/null
+++ b/src/spdk/dpdk/mk/exec-env/linuxapp/rte.vars.mk
@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 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: linuxapp, bsdapp
+#
+ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
+EXECENV_CFLAGS  = -pthread -fPIC
+else
+EXECENV_CFLAGS  = -pthread
+endif
+
+EXECENV_LDLIBS  =
+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
+
+# For shared libraries
+EXECENV_LDFLAGS += -export-dynamic
+# Add library to the group to resolve symbols
+EXECENV_LDLIBS  += -ldl
+
+export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS