ipxe: fix build with gcc 10.1.0
PATCH 1/1 ipxe: fix build with gcc 10.1.0
Apply two upstream patches to fix compiler warnings.
Signed-off-by Christopher Clark <[email protected]>
--- ...it-type-casts-for-nodnic_queue_pair_.patch | 43 +++++++++ ...-spurious-compiler-warning-on-GCC-10.patch | 89 +++++++++++++++++++ recipes-extended/ipxe/ipxe_git.bb | 2 + 3 files changed, 134 insertions(+) create mode 100644 recipes-extended/ipxe/files/ipxe-golan-Add-explicit-type-casts-for-nodnic_queue_pair_.patch create mode 100644 recipes-extended/ipxe/files/ipxe-intel-Avoid-spurious-compiler-warning-on-GCC-10.patch
recipes-extended/ipxe/files/ipxe-golan-Add-explicit-type-casts-for-nodnic_queue_pair_.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 8a1d66c7aec020f3e90254ed2fa55ecd9494fcc3 Mon Sep 17 00:00:00 2001 +From: Michael Brown <[email protected]> +Date: Sat, 27 Jun 2020 20:43:32 +0100 +Subject: [PATCH] [golan] Add explicit type casts for nodnic_queue_pair_type + +GCC 10 emits warnings for implicit conversions of enumerated types. + +The flexboot_nodnic code defines nodnic_queue_pair_type with values +identical to those of ib_queue_pair_type, and implicitly casts between +them. Add an explicit cast to fix the warning. + +Signed-off-by: Michael Brown <[email protected]> +--- + src/drivers/infiniband/flexboot_nodnic.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/drivers/infiniband/flexboot_nodnic.c b/src/drivers/infiniband/flexboot_nodnic.c +index 93bb0544..7d039fff 100644 +--- a/drivers/infiniband/flexboot_nodnic.c ++++ b/drivers/infiniband/flexboot_nodnic.c +@@ -365,7 +365,8 @@ static int flexboot_nodnic_create_qp ( struct ib_device *ibdev, + goto qp_alloc_err; + } + +- status = nodnic_port_create_qp(&port->port_priv, qp->type, ++ status = nodnic_port_create_qp(&port->port_priv, ++ (nodnic_queue_pair_type) qp->type, + qp->send.num_wqes * sizeof(struct nodnic_send_wqbb), + qp->send.num_wqes, + qp->recv.num_wqes * sizeof(struct nodnic_recv_wqe), +@@ -406,7 +407,8 @@ static void flexboot_nodnic_destroy_qp ( struct ib_device *ibdev, + struct flexboot_nodnic_port *port = &flexboot_nodnic->port[ibdev->port - 1]; + struct flexboot_nodnic_queue_pair *flexboot_nodnic_qp = ib_qp_get_drvdata ( qp ); + +- nodnic_port_destroy_qp(&port->port_priv, qp->type, ++ nodnic_port_destroy_qp(&port->port_priv, ++ (nodnic_queue_pair_type) qp->type, + flexboot_nodnic_qp->nodnic_queue_pair); + + free(flexboot_nodnic_qp); +-- +2.17.1 +
recipes-extended/ipxe/files/ipxe-intel-Avoid-spurious-compiler-warning-on-GCC-10.patch new file +89 -0
89 lines not on this page · raw message
recipes-extended/ipxe/ipxe_git.bb +2 -0
@@ -13,6 +13,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" SRC_URI = " \ git://git.ipxe.org/ipxe.git;protocol=https \ file://ipxe-fix-hostcc-nopie-cflags.patch \ + file://ipxe-intel-Avoid-spurious-compiler-warning-on-GCC-10.patch \ + file://ipxe-golan-Add-explicit-type-casts-for-nodnic_queue_pair_.patch \ " FILES_${PN} = "/usr/share/firmware/*.rom"
Signature · 1 line
2.17.1