import 15.2.0 Octopus source

[ceph.git] / ceph / src / seastar / dpdk / mk / toolchain / icc / rte.toolchain-compat.mk

diff --git a/ceph/src/seastar/dpdk/mk/toolchain/icc/rte.toolchain-compat.mk b/ceph/src/seastar/dpdk/mk/toolchain/icc/rte.toolchain-compat.mk
index 88f1ac92f41384598f8f31038e55eb8e6102261b..2d663b34ad553514725a5f742808057b11e4efd5 100644 (file)
--- a/ceph/src/seastar/dpdk/mk/toolchain/icc/rte.toolchain-compat.mk
+++ b/ceph/src/seastar/dpdk/mk/toolchain/icc/rte.toolchain-compat.mk
@@ -1,33 +1,5 @@
-#   BSD LICENSE
-#
-#   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
-#   All rights reserved.
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions
-#   are met:
-#
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in
-#       the documentation and/or other materials provided with the
-#       distribution.
-#     * Neither the name of Intel Corporation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2010-2014 Intel Corporation
 
 #
 # CPUID-related options
@@ -41,7 +13,7 @@
 ICC_MAJOR_VERSION = $(shell icc -dumpversion | cut -f1 -d.)
 
 ifeq ($(shell test $(ICC_MAJOR_VERSION) -lt 12 && echo 1), 1)
-       MACHINE_CFLAGS = -xSSE3
+       MACHINE_CFLAGS = -xSSE4.2
 $(warning You are not using ICC 12.x or higher. This is neither supported, nor tested.)
 
 else
@@ -77,4 +49,10 @@ else
        ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1)
                CONFIG_RTE_LIBRTE_THUNDERX_NICVF_PMD=d
        endif
+
+        # Disable event/opdl  PMD for icc <= 16.0
+       ifeq ($(shell test $(ICC_MAJOR_VERSION) -le 16 && echo 1), 1)
+               CONFIG_RTE_LIBRTE_PMD_OPDL_EVENTDEV=d
+       endif
+
 endif