diff options
Diffstat (limited to 'main/gcc/ada-musl.patch')
| -rw-r--r-- | main/gcc/ada-musl.patch | 55 |
1 files changed, 21 insertions, 34 deletions
diff --git a/main/gcc/ada-musl.patch b/main/gcc/ada-musl.patch index 7a86ae4afa..1487f4a57d 100644 --- a/main/gcc/ada-musl.patch +++ b/main/gcc/ada-musl.patch @@ -124,29 +124,9 @@ index 0d12f7e..a063b47 100644 #endif #if defined (_WIN32) -diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c -index 7025f57..207b50d 100644 ---- a/gcc/ada/terminals.c -+++ b/gcc/ada/terminals.c -@@ -1108,13 +1108,6 @@ __gnat_setup_winsize (void *desc, int rows, int columns) - #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__) && !defined (__QNXNTO__) --# include <termio.h> --#endif -- - #include <sys/ioctl.h> - #include <termios.h> - #include <fcntl.h> -diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in -index ebb955e..08cfbee 100644 ---- a/gcc/ada/gcc-interface/Makefile.in -+++ b/gcc/ada/gcc-interface/Makefile.in -@@ -1028,7 +1028,7 @@ ifeq ($(strip $(filter-out %86 linux%,$(target_cpu) $(target_os))),) +--- a/gcc/ada/Makefile.rtl 2019-05-14 21:18:45.217455681 +0200 ++++ b/gcc/ada/Makefile.rtl 2019-05-14 21:21:30.686464218 +0200 +@@ -1521,7 +1521,7 @@ s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \ $(TRASYM_DWARF_UNIX_PAIRS) \ g-sercom.adb<libgnat/g-sercom__linux.adb \ @@ -155,7 +135,7 @@ index ebb955e..08cfbee 100644 a-exetim.adb<libgnarl/a-exetim__posix.adb \ a-exetim.ads<libgnarl/a-exetim__default.ads \ s-linux.ads<libgnarl/s-linux.ads \ -@@ -1545,7 +1545,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),) +@@ -2073,7 +2073,7 @@ s-tpopsp.adb<libgnarl/s-tpopsp__tls.adb \ g-sercom.adb<libgnat/g-sercom__linux.adb \ $(TRASYM_DWARF_UNIX_PAIRS) \ @@ -164,7 +144,7 @@ index ebb955e..08cfbee 100644 $(ATOMICS_TARGET_PAIRS) \ $(ATOMICS_BUILTINS_TARGET_PAIRS) \ system.ads<libgnat/system-linux-ppc.ads -@@ -1574,7 +1574,7 @@ ifeq ($(strip $(filter-out powerpc% linux%,$(target_cpu) $(target_os))),) +@@ -2102,7 +2102,7 @@ endif # ARM linux, GNU eabi @@ -173,7 +153,7 @@ index ebb955e..08cfbee 100644 LIBGNAT_TARGET_PAIRS = \ a-intnam.ads<libgnarl/a-intnam__linux.ads \ s-inmaop.adb<libgnarl/s-inmaop__posix.adb \ -@@ -1774,7 +1774,7 @@ ifeq ($(strip $(filter-out %ia64 linux%,$(target_cpu) $(target_os))),) +@@ -2297,7 +2297,7 @@ s-taspri.ads<libgnarl/s-taspri__posix-noaltstack.ads \ g-sercom.adb<libgnat/g-sercom__linux.adb \ $(TRASYM_DWARF_UNIX_PAIRS) \ @@ -182,7 +162,7 @@ index ebb955e..08cfbee 100644 $(ATOMICS_TARGET_PAIRS) \ $(ATOMICS_BUILTINS_TARGET_PAIRS) \ system.ads<libgnat/system-linux-ia64.ads -@@ -1871,7 +1871,7 @@ ifeq ($(strip $(filter-out %x86_64 linux%,$(target_cpu) $(target_os))),) +@@ -2394,7 +2394,7 @@ s-taspri.ads<libgnarl/s-taspri__posix.ads \ g-sercom.adb<libgnat/g-sercom__linux.adb \ $(TRASYM_DWARF_UNIX_PAIRS) \ @@ -191,11 +171,18 @@ index ebb955e..08cfbee 100644 $(ATOMICS_TARGET_PAIRS) \ $(X86_64_TARGET_PAIRS) \ system.ads<libgnat/system-linux-x86.ads -diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c -index 207b50d..bd3a02c 100644 ---- a/gcc/ada/terminals.c -+++ b/gcc/ada/terminals.c -@@ -1152,7 +1152,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns) +--- a/gcc/ada/terminals.c 2019-01-08 10:54:04.000000000 +0100 ++++ b/gcc/ada/terminals.c 2019-05-15 13:14:09.935742526 +0200 +@@ -1136,7 +1136,7 @@ + /* POSIX does not specify how to open the master side of a terminal.Several + methods are available (system specific): + 1- using a cloning device (USE_CLONE_DEVICE) +- 2- getpt (USE_GETPT) ++ 2- posix_openpt (USE_POSIX_OPENPT) + 3- openpty (USE_OPENPTY) + + When using the cloning device method, the macro USE_CLONE_DEVICE should +@@ -1150,7 +1150,7 @@ #if defined (__APPLE__) || defined (BSD) #define USE_OPENPTY #elif defined (__linux__) @@ -204,13 +191,13 @@ index 207b50d..bd3a02c 100644 #elif defined (__sun__) #define USE_CLONE_DEVICE "/dev/ptmx" #elif defined (_AIX) -@@ -1201,8 +1201,8 @@ allocate_pty_desc (pty_desc **desc) { +@@ -1199,8 +1199,8 @@ int master_fd = -1; char *slave_name = NULL; -#ifdef USE_GETPT - master_fd = getpt (); -+#ifdef USE_POSIX_OPENPT ++#if defined(USE_POSIX_OPENPT) + master_fd = posix_openpt(O_RDWR | O_NOCTTY); #elif defined (USE_OPENPTY) status = openpty (&master_fd, &slave_fd, NULL, NULL, NULL); |