From nobody Fri Dec 24 12:13:36 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B3D60190AD30; Fri, 24 Dec 2021 12:13:36 +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 4JL5Z82jLvz3Q0F; Fri, 24 Dec 2021 12:13:36 +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 3DF2C23EBD; Fri, 24 Dec 2021 12:13:36 +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 1BOCDanP012215; Fri, 24 Dec 2021 12:13:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BOCDaqn012214; Fri, 24 Dec 2021 12:13:36 GMT (envelope-from git) Date: Fri, 24 Dec 2021 12:13:36 GMT Message-Id: <202112241213.1BOCDaqn012214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b5cbe4e98125 - stable/12 - Fix gcc gperf prototypes to avoid redeclaration errors List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b5cbe4e981254184d94b307b7dce0405ffcb0f3f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640348016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4HxVib5oURKRSmKQ9IPyK5y1SiaQZXd6jUSpsjsOzq0=; b=UuSCO9h9i/O0Rx3OI8dsj7F+uYeKYGh6bdQI9MTjCLMBOiJu4HQWsljnbNtEa1e4vizH/O rVherrYz75tkeFEvqjrO3jvYUF57CO6FO1MIJraUN67fiVPvOZB+M34b6iBE21ew/UU4Xy ZoqmnfKC8wzwXLg3ABQWZ5K79hHUpRBpGgEUdgOdFA1+m/e2A6t+M+vYnxYMHCYihn8B6h dLAlN0jle1NmKy5J4+QAPW2EOM5BBP1YU7fQZBg2b2n1M6kdOR9U9wSltJmODUkQ7PGLGS yUQTpwm19ZJXEBQMpelHKqhmb53kRUwPFuFk1Hy1CyCIAIBJzmJSrNmW22h4fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640348016; a=rsa-sha256; cv=none; b=WA1Whp56ebNFK27cK92pTdjBN30I5IGKLbN1XxjZHbmkLPjgtjbVj/FhWXtup2bIRF6FnW oilBhQixGe177Tv6pPzPdMg6mzQA4aotD/XVkUtHuTknyKOcZNrRhYkCcZnEg/i0O+1q58 v+NHCBbZbXuyGdGyl+Cv3oWdjoF4/HtWZfoOhZqSPN/XFPQScbnfs/M8Yn52G8Wl7q3ObN GoVCN+8urSuoH/GinvTrJnemqY8SNb9TUndTRQBSeEcZs4VjKVc2vW82vFQpD7Ty97+rUS tDhX5gmtueN5DkxSWo0pKgs8URmxCCpCjsdD0ijkrNaPsiDA9tImkMg8k5D8Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b5cbe4e981254184d94b307b7dce0405ffcb0f3f commit b5cbe4e981254184d94b307b7dce0405ffcb0f3f Author: Dimitry Andric AuthorDate: 2021-12-24 12:13:08 +0000 Commit: Dimitry Andric CommitDate: 2021-12-24 12:13:08 +0000 Fix gcc gperf prototypes to avoid redeclaration errors Otherwise, building stable/12's gcc on recent -CURRENT will result in redeclaration errors: In file included from /usr/src/contrib/gcc/cp/except.c:892: /usr/src/contrib/gcc/cp/cfns.gperf:20:1: error: conflicting types for 'hash' hash (register const char *str, register size_t len) ^ /usr/src/contrib/gcc/cp/cfns.gperf:5:21: note: previous declaration is here static unsigned int hash (const char *, unsigned int); ^ /usr/src/contrib/gcc/cp/cfns.gperf:78:1: error: conflicting types for 'libc_name_p' libc_name_p (register const char *str, register size_t len) ^ /usr/src/contrib/gcc/cp/cfns.gperf:9:14: note: previous declaration is here const char * libc_name_p (const char *, unsigned int); ^ Direct commit to stable/12, since gcc is gone in stable/13 and later. --- contrib/gcc/cp/cfns.gperf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/gcc/cp/cfns.gperf b/contrib/gcc/cp/cfns.gperf index c713eb0c2bdd..079926562919 100644 --- a/contrib/gcc/cp/cfns.gperf +++ b/contrib/gcc/cp/cfns.gperf @@ -2,11 +2,11 @@ #ifdef __GNUC__ __inline #endif -static unsigned int hash (const char *, unsigned int); +static unsigned int hash (register const char *, register size_t); #ifdef __GNUC__ __inline #endif -const char * libc_name_p (const char *, unsigned int); +const char * libc_name_p (register const char *, register size_t); %} %% # The standard C library functions, for feeding to gperf; the result is used