From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/12192 Path: news.gmane.org!.POSTED!not-for-mail From: Didier Kryn Newsgroups: gmane.linux.lib.musl.general Subject: Re: Building musl-cross-make with gnat in musl environement Date: Fri, 1 Dec 2017 08:31:54 +0100 Message-ID: <5928456e-a2e9-c4f3-4fff-c4100ca31e46@in2p3.fr> References: <69c03d16-1946-d4e3-f909-2bd2196afe97@in2p3.fr> <20171130170605.GK1627@brightrain.aerifal.cx> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1512113540 6213 195.159.176.226 (1 Dec 2017 07:32:20 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 1 Dec 2017 07:32:20 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 To: musl@lists.openwall.com Original-X-From: musl-return-12208-gllmg-musl=m.gmane.org@lists.openwall.com Fri Dec 01 08:32:16 2017 Return-path: Envelope-to: gllmg-musl@m.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by blaine.gmane.org with smtp (Exim 4.84_2) (envelope-from ) id 1eKfnx-0001ER-7k for gllmg-musl@m.gmane.org; Fri, 01 Dec 2017 08:32:13 +0100 Original-Received: (qmail 1496 invoked by uid 550); 1 Dec 2017 07:32:18 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Original-Received: (qmail 1472 invoked from network); 1 Dec 2017 07:32:17 -0000 X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99.2 at cczrelay02 In-Reply-To: <20171130170605.GK1627@brightrain.aerifal.cx> Content-Language: en-US Xref: news.gmane.org gmane.linux.lib.musl.general:12192 Archived-At: Le 30/11/2017 =C3=A0 18:06, Rich Felker a =C3=A9crit=C2=A0: > On Thu, Nov 30, 2017 at 05:30:35PM +0100, Didier Kryn wrote: >> Le 02/11/2017 =C3=A0 10:44, Didier Kryn a =C3=A9crit=C2=A0: >>> =C2=A0=C2=A0=C2=A0 I report the successfull build of the cross-compi= ler >>> x86_64-musl-gcc-6.3.0 - understanding Ada - on x86_64 Debian >>> Wheezy. >>> >>> =C2=A0=C2=A0=C2=A0 The toolchain for build was gcc-6.3.0 for Linux-G= nu provided >>> by Adacore.The build toolchain to build major version 6 must be at >>> least major version 5. >>> >>> =C2=A0=C2=A0=C2=A0 Of course, the language option must be >>> '--enable-languages=3Dada,c,c++' . >>> >>> =C2=A0=C2=A0=C2=A0 Three patches were necessary: >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gnat63-terminals.diff: removes = a #include in a C >>> source file. >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gnat63-prj-attr.diff: corrects = the layout of a record in an >>> Ada source file to prevent a warning concerning performance. >>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 gnat63-xr_tabls.diff: same as t= he previous. >> =C2=A0 In a glibc environment, x86_64-musl-gcc-6.3.0 builds without e= rror >> with the three patches I have previously reported. To check there is >> no leak of the glibc native toolchain into the cross-compiler, I >> tried the build in a musl chroot (without any glibc headers or >> library), still with '--enable-languages=3Dada,c,c++'. >> >> =C2=A0=C2=A0=C2=A0 In a first attempt, the compilation fails with the= following error: >> >> ---------------------------------------- >> In file included from ../../src_toolchain/gcc/ada/adaint.h:290:0, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 from ../../src_toolchain/gcc/ada/adadecode.c:= 45: >> /usr/pkg/gcc-6.3/lib/gcc/x86_64-pc-linux-musl/6.3.0/../../../../x86_64= -pc-linux-musl/include/sched.h:76:7: >> error: attempt to use poisoned "calloc" >> =C2=A0void *calloc(size_t, size_t); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ^ >> /usr/pkg/gcc-6.3/lib/gcc/x86_64-pc-linux-musl/6.3.0/../../../../x86_64= -pc-linux-musl/include/sched.h:116:36: >> error: attempt to use poisoned "calloc" >> =C2=A0#define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n)))= >> ---------------------------------------- >> >> =C2=A0=C2=A0=C2=A0 The Ada language has "tasking" primitives, which a= re nowadays >> based on POSIX threads. For this, adaint.h and other files include >> which, unfortunately, contains a declaration of calloc() >> and references to it. This is unfortunate because calloc() is >> poisoned=C2=A0 by gcc, to avoid interferences with its own allocation >> functions, and Gnat does only need a small part of sched.h. >> >> =C2=A0=C2=A0=C2=A0 There must be a necessity, specific to musl, to ma= ke use of >> calloc() in sched.h, because glibc doesn't do so. >> >> =C2=A0=C2=A0=C2=A0 A workaround, provided by the patch gnat63-adaint.= diff, is to >> replace #include with the few lines of this file actually >> needed in adaint.h. The patch contains also #define _SCHED_H, which >> is necessary to prevent the inclusion of sched.h by other files, >> directly or indirectly. >> >> =C2=A0=C2=A0=C2=A0 With this additional patch,=C2=A0 x86_64-musl-gcc-= 6.3.0 builds >> without error both in a glibc environement and in a musl >> environment. >> >> =C2=A0=C2=A0=C2=A0 Didier >> >> --- gcc-6.3.0-A/gcc/ada/adaint.c >> +++ gcc-6.3.0-B/gcc/ada/adaint.c >> @@ -3086,7 +3086,7 @@ >> #endif >> =20 >> #if defined (__linux__) >> -#include >> +/* do not #include */ >> =20 >> /* glibc versions earlier than 2.7 do not define the routines to han= dle >> dynamically allocated CPU sets. For these targets, we use the sta= tic >> --- gcc-6.3.0-A/gcc/ada/adaint.h >> +++ gcc-6.3.0-B/gcc/ada/adaint.h >> @@ -287,7 +287,17 @@ >> =20 >> /* Routines for interface to required CPU set primitives */ >> =20 >> -#include >> +/* Do not #include , but copy part of it and prevent its inc= lusion */ >> +# ifndef _SCHED_H >> +# define _SCHED_H >> +typedef struct cpu_set_t { unsigned long __bits[128/sizeof(long)]; } = cpu_set_t; >> +# define CPU_ZERO_S(size,set) memset(set,0,size) >> +# define CPU_ZERO(set) CPU_ZERO_S(sizeof(cpu_set_t),set) >> +# define __CPU_op_S(i, size, set, op) ( (i)/8U >=3D (size) ? 0 : \ >> + (((unsigned long *)(set))[(i)/8/sizeof(long)] op (1UL<<((i)%(= 8*sizeof(long))))) ) >> +# define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=3D) >> +# define CPU_SET(i, set) CPU_SET_S(i,sizeof(cpu_set_t),set) >> +# endif >> =20 >> extern cpu_set_t *__gnat_cpu_alloc (size_t); >> extern size_t __gnat_cpu_alloc_size (size_t); > Just patch out the poisoning instead. It's only meaningful to GCC > developers and should _not_ be used in deployment for reasons exactly > like what you discovered here, pretty much the same reasons -Werror > should not be enabled in deployment. > > Rich =C2=A0=C2=A0=C2=A0 Makes sense. Will look at that. =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 Didier