From nobody Sat May 7 15:57:18 2022 X-Original-To: dev-commits-src-branches@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 BBE781AC4B7B; Sat, 7 May 2022 15:57:19 +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 4KwXBQ6fjcz4Qys; Sat, 7 May 2022 15:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651939039; 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=5j+i3i19E2vzpgJflOWt8p0Qzql4aRKthkZcTVWVcU8=; b=S0LFmFkWPHqeurgJPs24UkdvAZRybTz1J1oYPSGRDV6Sm7imDlCsp3wq5YY0z3axyrdl1P YDIS1DEr0CwW046aJd70ZIS8cnucA/4H6TlPE++R9s9mOTevlZOkr0lbltwIBW354PPbR2 gs+dGQfgmmyhDi4DuvBFo4CdC2ErvJPpUirjTCh9RS24B+b/xkm+IiEjcs5voGQQZfbpgo X7PespWywFzSq+U/iRi143QeR8PZL+dDVgCIrO1yPC/H2qauQ2Ij7qftZ8N+cJB3fWzK1E dJvOdcpuckpMXWoIKWGfWL7fsuXF5CxwXPwAz4BIkUDSWpIZbbqqoOHG4Bz7zw== 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 BC38E13843; Sat, 7 May 2022 15:57:18 +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 247FvI3v015135; Sat, 7 May 2022 15:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 247FvINO015134; Sat, 7 May 2022 15:57:18 GMT (envelope-from git) Date: Sat, 7 May 2022 15:57:18 GMT Message-Id: <202205071557.247FvINO015134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alex Richardson Subject: git: 3c01fdcfc161 - stable/13 - cross-build: fix some redeclaration warnings during bootstrap List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c01fdcfc161b06732b0762e37d1beca4a1f214d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651939039; 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=5j+i3i19E2vzpgJflOWt8p0Qzql4aRKthkZcTVWVcU8=; b=GdMAuYqCGWkFefvCb46lB+nfZW14Okk9lUP3fxrkwEkpOTcvhg+ZyZmy3xDYb9pFbGwA5v wyFpIhrh15Jgs8wH7m1hr3TIM782plTxqo8mYntxHqL0DIZnkuAq7EiMkxAPMEkG1Muv2+ FjiFFnt1f+FHr+XAYb2qIfC5LOE27jS0y1T66yr0ywoVGpKkfZ5TB6z40HaNm8jNTSf75O gB+92Mpd+BpVZmeXfISYErGDTFI5DEkGFJIXS1JaVYGMNaLqD6a4poxFKtW2BClH+00vo9 9T9yuNaA9nxnKtZIKtBAx/9cmz5dI1aslGZ3W+Mkbll6sWqcXG56bs9iKAgz4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651939039; a=rsa-sha256; cv=none; b=h0XGd4hAzDbKMR7myl9lMqKOOVVd1a7egoozrmfFUhIAnQ8SGfN+ZIEUZkw/SXJ4O+g/fi 4o36Vmrbue3YZHAYhIrVRkQL8qowy0HoTfJW3x8qBlMwuf2L+KDoenWiWONpuhd2XjXash NpNmRvdNs1EHQi+ZnFY8/0vvB8Zf18F+QxybJf+910dIcvHMwmp75lK9g6f4ZJPHN8tHGY SYIAq6GN966tUQbg7GlGm1FIypXcUs+O2x0JIy4WEjUdnhqiSVyS7DaC0+Jp+UeA+ha9d/ BWKAP4p3IJr1jl8j1uxg6J9IO7Q3BrSj6wn15uAT9HRWjDKoE1MkybpF50RP+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=3c01fdcfc161b06732b0762e37d1beca4a1f214d commit 3c01fdcfc161b06732b0762e37d1beca4a1f214d Author: Alex Richardson AuthorDate: 2021-09-13 09:11:47 +0000 Commit: Alex Richardson CommitDate: 2022-05-07 12:09:56 +0000 cross-build: fix some redeclaration warnings during bootstrap MFC after: 3 days (cherry picked from commit a89410ef91798859f3fd7a5f675184b4d711ade4) --- tools/build/cross-build/include/linux/stdio.h | 8 ++++++-- tools/build/cross-build/include/linux/stdlib.h | 2 -- tools/build/cross-build/include/linux/sys/param.h | 3 --- tools/build/cross-build/include/linux/unistd.h | 4 ---- tools/build/cross-build/include/mac/stdlib.h | 2 -- 5 files changed, 6 insertions(+), 13 deletions(-) diff --git a/tools/build/cross-build/include/linux/stdio.h b/tools/build/cross-build/include/linux/stdio.h index 340977c15d93..c5aa893b320c 100644 --- a/tools/build/cross-build/include/linux/stdio.h +++ b/tools/build/cross-build/include/linux/stdio.h @@ -37,13 +37,17 @@ */ /* No #pragam once since glibc can include this multiple times */ -#include - #include_next +#ifndef _BOOTSTRAP_LINUX_STDIO_H +#define _BOOTSTRAP_LINUX_STDIO_H +#include + __BEGIN_DECLS char *fgetln(FILE *, __SIZE_TYPE__ *); #if defined(_WCHAR_H) __WCHAR_TYPE__ *fgetwln(FILE *__restrict, __SIZE_TYPE__ *__restrict); #endif __END_DECLS + +#endif diff --git a/tools/build/cross-build/include/linux/stdlib.h b/tools/build/cross-build/include/linux/stdlib.h index 9e0c1de02ccb..1e559ce1158c 100644 --- a/tools/build/cross-build/include/linux/stdlib.h +++ b/tools/build/cross-build/include/linux/stdlib.h @@ -60,8 +60,6 @@ int cgetustr(char *, const char *, char **); const char *getprogname(void); void setprogname(const char *progname); -void *reallocarray(void *, size_t, size_t) __result_use_check - __alloc_size2(2, 3); void *reallocf(void *, size_t) __result_use_check __alloc_size(2); unsigned arc4random(void); diff --git a/tools/build/cross-build/include/linux/sys/param.h b/tools/build/cross-build/include/linux/sys/param.h index c918998e06a3..305d2767ae7e 100644 --- a/tools/build/cross-build/include/linux/sys/param.h +++ b/tools/build/cross-build/include/linux/sys/param.h @@ -47,6 +47,3 @@ * let's use 32 since that will work across all systems */ #define MAXLOGNAME 33 /* max login name length (incl. NUL) */ - -/* For elftoolchain (seems like on ubuntu it's in errno.h) */ -extern char *program_invocation_short_name; diff --git a/tools/build/cross-build/include/linux/unistd.h b/tools/build/cross-build/include/linux/unistd.h index 9d1bd1bf4025..cd0b28ba39ed 100644 --- a/tools/build/cross-build/include/linux/unistd.h +++ b/tools/build/cross-build/include/linux/unistd.h @@ -77,10 +77,6 @@ getentropy(void *buf, size_t buflen) } #endif -/* Used by elftoolchain: */ -extern char *program_invocation_name; -extern char *program_invocation_short_name; - void *setmode(const char *); mode_t getmode(const void *, mode_t); diff --git a/tools/build/cross-build/include/mac/stdlib.h b/tools/build/cross-build/include/mac/stdlib.h index fd9ba7fe6660..314ae0d1dca6 100644 --- a/tools/build/cross-build/include/mac/stdlib.h +++ b/tools/build/cross-build/include/mac/stdlib.h @@ -45,6 +45,4 @@ int rpmatch(const char *response); long long strtonum(const char *numstr, long long minval, long long maxval, const char **errstrp); -void *reallocarray(void *optr, size_t nmemb, size_t size); - __END_DECLS