[gcc-6] 13/401: * Update the ada-kfreebsd patch.
Ximin Luo
infinity0 at debian.org
Wed Apr 5 15:47:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.
commit 096deb190350335d41978209775e58f931a86582
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun Dec 13 11:21:03 2015 +0000
* Update the ada-kfreebsd patch.
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8498 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 6 ++++++
debian/patches/ada-kfreebsd.diff | 37 +++++++++++++++++++------------------
debian/rules.patch | 2 +-
3 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1719dee..aaae678 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-6 (6-20151211-2) UNRELEASED; urgency=medium
+
+ * Update the ada-kfreebsd patch.
+
+ -- Matthias Klose <doko at debian.org> Sun, 13 Dec 2015 12:20:23 +0100
+
gcc-6 (6-20151211-1) experimental; urgency=medium
* GCC 6 snapshot build, taken from 20151211.
diff --git a/debian/patches/ada-kfreebsd.diff b/debian/patches/ada-kfreebsd.diff
index 9326fbe..4bb0069 100644
--- a/debian/patches/ada-kfreebsd.diff
+++ b/debian/patches/ada-kfreebsd.diff
@@ -4,14 +4,16 @@ Index: b/src/gcc/ada/terminals.c
===================================================================
--- a/src/gcc/ada/terminals.c
+++ b/src/gcc/ada/terminals.c
-@@ -1071,6 +1071,7 @@ __gnat_setup_winsize (void *desc, int ro
+@@ -1071,7 +1071,8 @@ __gnat_setup_winsize (void *desc, int ro
/* On some system termio is either absent or including it will disable termios
(HP-UX) */
- #if ! defined (__hpux__) && ! defined (FREEBSD) && \
-+ ! defined (__FreeBSD_kernel__) && ! defined (__GNU__) && \
- ! defined (__APPLE__) && ! defined(__rtems__)
+ #if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \
+- && !defined (__rtems__)
++ && ! defined (__FreeBSD_kernel__) && ! defined (__GNU__) \
++ && ! defined (__rtems__)
# include <termio.h>
#endif
+
Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.adb
===================================================================
--- /dev/null
@@ -179,7 +181,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
===================================================================
--- a/src/gcc/ada/gcc-interface/Makefile.in
+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1366,7 +1366,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%
+@@ -1397,7 +1397,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%
a-intnam.ads<a-intnam-freebsd.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
@@ -188,7 +190,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
s-osprim.adb<s-osprim-posix.adb \
s-taprop.adb<s-taprop-posix.adb \
-@@ -1426,7 +1426,7 @@ ifeq ($(strip $(filter-out x86_64 kfreeb
+@@ -1457,7 +1457,7 @@ ifeq ($(strip $(filter-out x86_64 kfreeb
a-numaux.ads<a-numaux-x86.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
@@ -232,7 +234,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
function To_Duration (TS : timespec) return Duration;
pragma Inline (To_Duration);
-@@ -437,31 +459,25 @@ package System.OS_Interface is
+@@ -437,31 +441,25 @@ package System.OS_Interface is
PTHREAD_PRIO_PROTECT : constant := 2;
PTHREAD_PRIO_INHERIT : constant := 1;
@@ -268,7 +270,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
type struct_sched_param is record
sched_priority : int; -- scheduling priority
-@@ -588,8 +604,8 @@ private
+@@ -588,8 +586,8 @@ private
-- #define sa_handler __sigaction_u._handler
-- #define sa_sigaction __sigaction_u._sigaction
@@ -279,7 +281,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
-- sigcontext type is opaque, so it is architecturally neutral.
-- It is always passed as an access type, so define it as an empty record
-- since the contents are not used anywhere.
-@@ -606,9 +622,6 @@ private
+@@ -606,9 +604,6 @@ private
end record;
pragma Convention (C, timespec);
@@ -293,25 +295,24 @@ Index: b/src/gcc/ada/gsocket.h
===================================================================
--- a/src/gcc/ada/gsocket.h
+++ b/src/gcc/ada/gsocket.h
-@@ -241,7 +241,7 @@
- # endif
+@@ -243,6 +243,7 @@
#endif
--#if defined (__FreeBSD__) || defined (__vxworks) || defined(__rtems__)
-+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__vxworks) || defined(__rtems__) || defined(__GNU__)
+ #if defined (__FreeBSD__) || defined (__vxworks) || defined(__rtems__) \
++ || defined (__FreeBSD_kernel__) || defined(__GNU__) \
+ || defined (__DragonFly__) || defined (__NetBSD__) || defined (__OpenBSD__)
# define Has_Sockaddr_Len 1
#else
- # define Has_Sockaddr_Len 0
Index: b/src/gcc/ada/s-oscons-tmplt.c
===================================================================
--- a/src/gcc/ada/s-oscons-tmplt.c
+++ b/src/gcc/ada/s-oscons-tmplt.c
-@@ -1435,7 +1435,7 @@ CND(CLOCK_FASTEST, "Fastest clock")
- #endif
+@@ -1436,7 +1436,7 @@ CND(CLOCK_FASTEST, "Fastest clock")
CND(CLOCK_THREAD_CPUTIME_ID, "Thread CPU clock")
--#if defined(__FreeBSD__) || (defined(_AIX) && defined(_AIXVERSION_530))
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || (defined(_AIX) && defined(_AIXVERSION_530))
+ #if defined(__FreeBSD__) || (defined(_AIX) && defined(_AIXVERSION_530)) \
+- || defined(__DragonFly__)
++ || defined(__DragonFly__) || defined(__FreeBSD_kernel__)
/** On these platforms use system provided monotonic clock instead of
** the default CLOCK_REALTIME. We then need to set up cond var attributes
** appropriately (see thread.c).
diff --git a/debian/rules.patch b/debian/rules.patch
index d782eec..d173e10 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -123,7 +123,7 @@ endif
debian_patches += ada-arm
debian_patches += ada-hurd
-# FIXME: update debian_patches += ada-kfreebsd
+debian_patches += ada-kfreebsd
debian_patches += ada-revert-pr63225
ifeq ($(with_ada),yes)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git
More information about the Reproducible-commits
mailing list