From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 863AD3858D32; Mon, 10 Jul 2023 08:42:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 863AD3858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688978578; bh=ytLwSCULcRnQcGDFvIZnM3Hus19eYrmAxJ2+l0qiTMk=; h=From:To:Subject:Date:From; b=grf4jC5WBLf1dlml7Uz2KTr45Z6EzsLalM7dSTdiCWD9nvt0wBeeXn2CWajT/IeGh 16hekPdeNyGr6yG43jHLwEC8BZu+yz9Z0BefYCY1I9tqoUO0Z8mXTQPJgz2JtMeNFG c89RPhvFX8g9k3tV1FPaln7R/uxqEADo1EUVeflA= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: Make gcc-specific code in compiler-agnostic X-Act-Checkin: newlib-cygwin X-Git-Author: Mark Geisert X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: 1a0530f3e0564e6c0755b57dfea0efbf58eb62f4 X-Git-Newrev: df0f296f59d24fbad1fbc3cd791bf3f362116c4f Message-Id: <20230710084258.863AD3858D32@sourceware.org> Date: Mon, 10 Jul 2023 08:42:58 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Ddf0f296f59d= 24fbad1fbc3cd791bf3f362116c4f commit df0f296f59d24fbad1fbc3cd791bf3f362116c4f Author: Mark Geisert AuthorDate: Sun Jul 9 00:59:22 2023 -0700 Commit: Corinna Vinschen CommitDate: Mon Jul 10 10:29:41 2023 +0200 Cygwin: Make gcc-specific code in compiler-agnostic =20 The current version of cannot be compiled by Clang due to the use of builtin versions of malloc, free, and memset. Their presence here was a dubious optimization anyway, so their usage has been converted to standard library functions. =20 The use of __builtin_popcountl remains because Clang implements it just like gcc does. If/when some other compiler (Rust? Go?) runs into this issue we can deal with specialized handling then. =20 The "#include " here to define __inline can be removed since both of the new includes sub-include it. =20 Addresses: https://cygwin.com/pipermail/cygwin/2023-July/253927.html Fixes: 9cc910dd33a5 (Cygwin: Make safe for c89 compilati= ons) Signed-off-by: Mark Geisert Diff: --- winsup/cygwin/include/sys/cpuset.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/include/sys/cpuset.h b/winsup/cygwin/include/sys= /cpuset.h index 0c95134ff31a..95c777cfbc6d 100644 --- a/winsup/cygwin/include/sys/cpuset.h +++ b/winsup/cygwin/include/sys/cpuset.h @@ -9,7 +9,8 @@ details. */ #ifndef _SYS_CPUSET_H_ #define _SYS_CPUSET_H_ =20 -#include +#include +#include =20 #ifdef __cplusplus extern "C" { @@ -44,14 +45,14 @@ __cpuset_alloc_size (int num) static __inline cpu_set_t * __cpuset_alloc (int num) { - return (cpu_set_t *) __builtin_malloc (CPU_ALLOC_SIZE(num)); + return (cpu_set_t *) malloc (CPU_ALLOC_SIZE(num)); } =20 #define CPU_FREE(set) __cpuset_free (set) static __inline void __cpuset_free (cpu_set_t *set) { - __builtin_free (set); + free (set); } =20 /* These _S macros operate on dynamically-sized cpu sets of size 'siz' byt= es */ @@ -59,7 +60,7 @@ __cpuset_free (cpu_set_t *set) static __inline void __cpuset_zero_s (size_t siz, cpu_set_t *set) { - (void) __builtin_memset (set, 0, siz); + (void) memset (set, 0, siz); } =20 #define CPU_SET_S(cpu, siz, set) __cpuset_set_s (cpu, siz, set)