From owner-dev-commits-src-all@freebsd.org Wed Sep 15 16:05:30 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 40A62668FBF; Wed, 15 Sep 2021 16:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H8lRs6KYlz3GQc; Wed, 15 Sep 2021 16:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ADC6610DC6; Wed, 15 Sep 2021 16:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18FG5TSd086453; Wed, 15 Sep 2021 16:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18FG5Tn7086452; Wed, 15 Sep 2021 16:05:29 GMT (envelope-from git) Date: Wed, 15 Sep 2021 16:05:29 GMT Message-Id: <202109151605.18FG5Tn7086452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 44126818d2ec - main - infiniband: Disable -Wredundant-decl warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44126818d2ec96d8247eafcae9b96905a473a264 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2021 16:05:30 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=44126818d2ec96d8247eafcae9b96905a473a264 commit 44126818d2ec96d8247eafcae9b96905a473a264 Author: John Baldwin AuthorDate: 2021-09-15 16:03:18 +0000 Commit: John Baldwin CommitDate: 2021-09-15 16:03:18 +0000 infiniband: Disable -Wredundant-decl warnings. ib_uverbs_flow_resources_free() is declard in two header files in upstream OFED. Disable the warning to avoid introducing diffs to fix the build on GCC 9. While here, fix the ibcore module to disable the same warnings disabled in OFED_CFLAGS. Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D31943 --- sys/conf/kern.pre.mk | 2 +- sys/modules/ibcore/Makefile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index d9621273c57b..9d9e32027ec7 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -297,7 +297,7 @@ LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES} # Infiniband C flags. Correct include paths and omit errors that linux # does not honor. OFEDINCLUDES= -I$S/ofed/include -I$S/ofed/include/uapi ${LINUXKPI_INCLUDES} -OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith +OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith -Wno-redundant-decls OFEDCFLAGS= ${CFLAGS:N-I*} -DCONFIG_INFINIBAND_USER_MEM \ ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile index 00d7ed976416..951f0abab453 100644 --- a/sys/modules/ibcore/Makefile +++ b/sys/modules/ibcore/Makefile @@ -53,3 +53,5 @@ CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include CFLAGS+= -DINET6 -DINET -DCONFIG_INFINIBAND_USER_MEM .include + +CWARNFLAGS+= -Wno-cast-qual -Wno-pointer-arith -Wno-redundant-decls