Re: Building musl-cross-make with gnat in musl environement

[Didier Kryn <kryn@in2p3.fr>]

[-- Attachment #1: Type: text/plain, Size: 464 bytes --]

Le 30/11/2017 à 18:06, Rich Felker a écrit :
> 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.

     Here is a new set of patches in this spirit. Posionning of calloc 
is removed and compilation switches are changed for gnattools.

     Didier


[-- Attachment #2: gnat63-no-poison.diff --]
[-- Type: text/x-patch, Size: 317 bytes --]

--- gcc-6.3.0-A/gcc/system.h
+++ gcc-6.3.0-B/gcc/system.h
@@ -819,7 +819,8 @@
 #ifndef USES_ISL
 #undef calloc
 #undef strdup
- #pragma GCC poison calloc strdup
+/* Do not poison calloc because it is declared in musl's sched.h */
+ #pragma GCC poison strdup
 #endif
 
 #if !defined(FLEX_SCANNER) && !defined(YYBISON)

[-- Attachment #3: gnat63-gnattools.diff --]
[-- Type: text/x-patch, Size: 451 bytes --]

diff -rupN gcc-6.3.0-A/gnattools/Makefile.in gcc-6.3.0-B/gnattools/Makefile.in
--- gcc-6.3.0-A/gnattools/Makefile.in	2016-04-04 18:37:58.000000000 +0200
+++ gcc-6.3.0-B/gnattools/Makefile.in	2017-12-06 15:15:01.000000000 +0100
@@ -52,7 +52,7 @@ WARN_CFLAGS = @warn_cflags@
 ADA_CFLAGS=@ADA_CFLAGS@
 
 # Variables for gnattools.
-ADAFLAGS= -gnatpg -gnata
+ADAFLAGS= -gnata
 
 # For finding the GCC build dir, which is used far too much
 GCC_DIR=../gcc

[-- Attachment #4: gnat63-terminals.diff --]
[-- Type: text/x-patch, Size: 597 bytes --]

diff -rupN gcc-6.3.0-A/gcc/ada/terminals.c gcc-6.3.0-B/gcc/ada/terminals.c
--- gcc-6.3.0-A/gcc/ada/terminals.c	2016-02-12 00:53:54.000000000 +0100
+++ gcc-6.3.0-B/gcc/ada/terminals.c	2017-10-13 08:17:35.000000000 +0200
@@ -1068,12 +1068,6 @@ __gnat_setup_winsize (void *desc, int ro
 #include <stdio.h>
 #include <stdlib.h>
 
-/* On some system termio is either absent or including it will disable termios
-   (HP-UX) */
-#if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \
-  && !defined (__rtems__)
-#   include <termio.h>
-#endif
 
 #include <sys/ioctl.h>
 #include <termios.h>