[gcc-7] 206/354: ada: Drop references to obsolete termio-h.diff. Closes: #845159.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit defebe41c61516f8d216ec816eb1c7d59d10994b
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Jun 12 15:36:54 2017 +0000

    ada: Drop references to obsolete termio-h.diff. Closes: #845159.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9509 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/ada-drop-termio-h.diff | 39 +++++++++++++++++++++++++++++++++++
 debian/patches/ada-kfreebsd.diff      | 12 -----------
 debian/rules.patch                    |  1 +
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/debian/patches/ada-drop-termio-h.diff b/debian/patches/ada-drop-termio-h.diff
new file mode 100644
index 0000000..3461030
--- /dev/null
+++ b/debian/patches/ada-drop-termio-h.diff
@@ -0,0 +1,39 @@
+Description: ada/terminals.c: remove obsolete termio.h
+ On all architectures, the terminals.c source file #includes
+ <termios.h> and declares variables with type struct termios.
+ .
+ Some platforms provide a compatibility termio.h, which only defines
+ the termio structure.
+ .
+ terminals.c also #includes <termio.h>, probably for historical
+ reasons since no termio structure is ever used.
+ .
+ Drop the #include instead of maintaining a list of architectures.
+Author: Nicolas Boulenguez <nicolas at debian.org>
+Bug-Debian: https://bugs.debian.org/845159
+
+--- a/src/gcc/ada/terminals.c
++++ b/src/gcc/ada/terminals.c
+@@ -1060,14 +1060,6 @@
+ #include <errno.h>
+ #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>
+ #include <fcntl.h>
+@@ -1083,7 +1075,6 @@
+ #   include <sys/signal.h>
+ #endif
+ #if defined (__hpux__)
+-#   include <sys/termio.h>
+ #   include <sys/stropts.h>
+ #endif
+ 
diff --git a/debian/patches/ada-kfreebsd.diff b/debian/patches/ada-kfreebsd.diff
index a6928b8..42f0c1e 100644
--- a/debian/patches/ada-kfreebsd.diff
+++ b/debian/patches/ada-kfreebsd.diff
@@ -1,17 +1,5 @@
 # DP: add support for GNU/kFreeBSD.
 
---- a/src/gcc/ada/terminals.c
-+++ b/src/gcc/ada/terminals.c
-@@ -1064,7 +1064,8 @@
- /* 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 (__FreeBSD_kernel__) && ! defined (__GNU__) \
-+  && ! defined (__rtems__)
- #   include <termio.h>
- #endif
- 
 --- /dev/null
 +++ b/src/gcc/ada/s-osinte-kfreebsd-gnu.adb
 @@ -0,0 +1,158 @@
diff --git a/debian/rules.patch b/debian/rules.patch
index 07a5fa5..4bca03e 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -233,6 +233,7 @@ debian_patches += skip-bootstrap-multilib
 debian_patches += libffi-ro-eh_frame_sect
 debian_patches += libffi-mips
 debian_patches += ada-kfreebsd
+debian_patches += ada-drop-termio-h
 
 # sigaction on sparc changed between glibc 2.19 and 2.21
 ifeq (,$(filter 2.1%, $(shell dpkg-query -l libc-bin | awk '/^.i/ {print $$3}')))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git