From patchwork Tue Dec 5 17:29:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 1872249 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Sl6wV5xmnz1yST for ; Wed, 6 Dec 2023 04:29:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6BA393858281 for ; Tue, 5 Dec 2023 17:29:28 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com [68.232.137.180]) by sourceware.org (Postfix) with ESMTPS id 167203858D32 for ; Tue, 5 Dec 2023 17:29:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 167203858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 167203858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=68.232.137.180 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701797358; cv=none; b=s6y9pH9to3Eq2vt5puwblpCELOGPUZOReCfnrhQz5FMumB6xFCYPAkEQ6DrfaHmRFEjH5aeYfOlfuTUXWo6SksG1hhKX2UIrWCZGgXuLgc4uBF/aveNpm1iTMBALHDVvfznl5Y2agl13RbhHLDV2LJ+GEXskDpOn991ZSy1Yku4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701797358; c=relaxed/simple; bh=GeAYzDw+mU70/Lh5L3fCZ0EKVxsMwWkSJpkPmN/il9Q=; h=Message-ID:Date:MIME-Version:To:From:Subject; b=Sz4wCSgpP9fuZWaqKkCxAZK9X6LyZENLPBfA2Q9rvCASw0askJf/Nf6vssgd489jdl/gTaQUXNjWrci2a/wX1cN/PlSYvnKXpXRYCeON45is/wwu++BTBS0nDTDZWL1MEqDzaqIDw4nZ4TAcajwyk8qYh0RY5+WdNsM4TLS0H8E= ARC-Authentication-Results: i=1; server2.sourceware.org X-CSE-ConnectionGUID: S7HZF9YVTEOvftBmMxK7PQ== X-CSE-MsgGUID: 8yl4EmCFSVOZeIl2BZFEfQ== X-IronPort-AV: E=Sophos;i="6.04,252,1695715200"; d="diff'?scan'208";a="24550194" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 05 Dec 2023 09:29:15 -0800 IronPort-SDR: oQviqD26m8hDIvuAsX5UeyGbScbskwL3QDbkBrk5A/BOGElqRUDHFTs4vWxv9cwGYUbza/NIoN zmEZYUFcmemc8Dmdgxv4KhTsN/5opzBBnfan4XBlexHLDeJ7LM0109cu79XN8esoRaPdOWH7iM oLaO/0XU0so2rZjTWQ1NFVpZKQSMBOrdzrBarZi9TsEOieNkQW+v922kmhWJKYg+WAp9OkIL55 w5WTGTbPgg99FtekP+W3XiFgcWWVHCON1PoP/aAXvnRWZ4QY33mt/+tXTITRyCAr1wsQtjR6gc 9yI= Message-ID: <4acc4d97-bc80-4d2b-b00e-4eaa872d5f53@codesourcery.com> Date: Tue, 5 Dec 2023 18:29:10 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: gcc-patches From: Tobias Burnus Subject: [Patch] tsystem.h: Declare calloc/realloc #ifdef inhibit_libc X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Crossref, there is are -Wbuiltin-declaration-mismatch warnings in libgcc/emutls.c, cf. https://gcc.gnu.org/PR109289 I decided to leave this to Thomas and Florian and just fix the build issue with the attached patch. That build issue was also mentioned in PR libgcc/109289. An alternative would be __builtin, but as the other #define were pre-existing, I went for the tsystem.h version. OK for mainline? Tobias ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 tsystem.h: Declare calloc/realloc #ifdef inhibit_libc Declare calloc and realloc #ifndef and inhibit_libc is defined. Those are used by libgcc/emutls.c. gcc/ChangeLog: * tsystem.h (calloc, realloc): Declare when inhibit_libc. diff --git a/gcc/tsystem.h b/gcc/tsystem.h index 081c73345cd..c49ff578cb7 100644 --- a/gcc/tsystem.h +++ b/gcc/tsystem.h @@ -47,12 +47,20 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifdef inhibit_libc #ifndef malloc extern void *malloc (size_t); #endif +#ifndef calloc +extern void *calloc(size_t, size_t); +#endif + +#ifndef realloc +extern void *realloc(void *, size_t); +#endif + #ifndef free extern void free (void *); #endif #ifndef atexit extern int atexit (void (*)(void));