[gcc-7] 220/354: Simplify ada-kfreebsd.diff: stop embedding a copy of s-osinte-posix.adb renamed s-osinte-freebsd-gnu.adb. Add the 4 functions into s-osinte-freebsd-gnus.ads thanks to Ada2012 syntax.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository gcc-7.
commit 21dc79f8664cb3646ba2e83291076d630471dcf0
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun Jun 18 01:09:53 2017 +0000
Simplify ada-kfreebsd.diff: stop embedding a copy of
s-osinte-posix.adb renamed s-osinte-freebsd-gnu.adb. Add the 4
functions into s-osinte-freebsd-gnus.ads thanks to Ada2012 syntax.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9523 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 1 +
debian/patches/ada-kfreebsd.diff | 212 +++------------------------------------
2 files changed, 16 insertions(+), 197 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4a34bf9..4bba5e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ gcc-7 (7.1.0-7) UNRELEASED; urgency=medium
* Ada: Drop dpkg-buildflags usage in patches. Closes: #863289.
* ada: Drop references to obsolete termio-h.diff. Closes: #845159.
* ada-749574.diff: replace work-around with fix and forward it.
+ * ada-kfreebsd.diff: reduce a lot thanks to Ada2012 syntax.
-- Matthias Klose <doko at debian.org> Sat, 17 Jun 2017 15:56:17 +0200
diff --git a/debian/patches/ada-kfreebsd.diff b/debian/patches/ada-kfreebsd.diff
index 42f0c1e..37953b7 100644
--- a/debian/patches/ada-kfreebsd.diff
+++ b/debian/patches/ada-kfreebsd.diff
@@ -1,186 +1,11 @@
-# DP: add support for GNU/kFreeBSD.
+Description: add support for GNU/kFreeBSD.
+ GNU/kFreeBSD does not support Thread Priority Protection or Thread
+ Priority Inheritance and lacks some pthread_mutexattr_* functions.
+ Replace them with dummy versions.
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=642128
+Author: Ludovic Brenta <lbrenta at debian.org>
+Author: Nicolas Boulenguez <nicolas at debian.org>
---- /dev/null
-+++ b/src/gcc/ada/s-osinte-kfreebsd-gnu.adb
-@@ -0,0 +1,158 @@
-+------------------------------------------------------------------------------
-+-- --
-+-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
-+-- --
-+-- S Y S T E M . O S _ I N T E R F A C E --
-+-- --
-+-- B o d y --
-+-- --
-+-- Copyright (C) 1991-1994, Florida State University --
-+-- Copyright (C) 1995-2006, AdaCore --
-+-- --
-+-- GNARL is free software; you can redistribute it and/or modify it under --
-+-- terms of the GNU General Public License as published by the Free Soft- --
-+-- ware Foundation; either version 2, or (at your option) any later ver- --
-+-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
-+-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY --
-+-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --
-+-- for more details. You should have received a copy of the GNU General --
-+-- Public License distributed with GNARL; see file COPYING. If not, write --
-+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, --
-+-- Boston, MA 02110-1301, USA. --
-+-- --
-+-- As a special exception, if other files instantiate generics from this --
-+-- unit, or you link this unit with other files to produce an executable, --
-+-- this unit does not by itself cause the resulting executable to be --
-+-- covered by the GNU General Public License. This exception does not --
-+-- however invalidate any other reasons why the executable file might be --
-+-- covered by the GNU Public License. --
-+-- --
-+-- GNARL was developed by the GNARL team at Florida State University. --
-+-- Extensive contributions were provided by Ada Core Technologies, Inc. --
-+-- --
-+------------------------------------------------------------------------------
-+
-+-- This is the GNU/kFreeBSD version of this package.
-+
-+pragma Polling (Off);
-+-- Turn off polling, we do not want ATC polling to take place during
-+-- tasking operations. It causes infinite loops and other problems.
-+
-+-- This package encapsulates all direct interfaces to OS services
-+-- that are needed by children of System.
-+
-+package body System.OS_Interface is
-+
-+ --------------------
-+ -- Get_Stack_Base --
-+ --------------------
-+
-+ function Get_Stack_Base (thread : pthread_t) return Address is
-+ pragma Warnings (Off, thread);
-+
-+ begin
-+ return Null_Address;
-+ end Get_Stack_Base;
-+
-+ ------------------
-+ -- pthread_init --
-+ ------------------
-+
-+ procedure pthread_init is
-+ begin
-+ null;
-+ end pthread_init;
-+
-+ -----------------------------------
-+ -- pthread_mutexattr_setprotocol --
-+ -----------------------------------
-+
-+ function pthread_mutexattr_setprotocol
-+ (attr : access pthread_mutexattr_t;
-+ protocol : int) return int is
-+ pragma Unreferenced (attr, protocol);
-+ begin
-+ return 0;
-+ end pthread_mutexattr_setprotocol;
-+
-+ -----------------------------------
-+ -- pthread_mutexattr_getprotocol --
-+ -----------------------------------
-+
-+ function pthread_mutexattr_getprotocol
-+ (attr : access pthread_mutexattr_t;
-+ protocol : access int) return int is
-+ pragma Unreferenced (attr, protocol);
-+ begin
-+ return 0;
-+ end pthread_mutexattr_getprotocol;
-+
-+ --------------------------------------
-+ -- pthread_mutexattr_setprioceiling --
-+ --------------------------------------
-+
-+ function pthread_mutexattr_setprioceiling
-+ (attr : access pthread_mutexattr_t;
-+ prioceiling : int) return int is
-+ pragma Unreferenced (attr, prioceiling);
-+ begin
-+ return 0;
-+ end pthread_mutexattr_setprioceiling;
-+
-+ --------------------------------------
-+ -- pthread_mutexattr_getprioceiling --
-+ --------------------------------------
-+
-+ function pthread_mutexattr_getprioceiling
-+ (attr : access pthread_mutexattr_t;
-+ prioceiling : access int) return int is
-+ pragma Unreferenced (attr, prioceiling);
-+ begin
-+ return 0;
-+ end pthread_mutexattr_getprioceiling;
-+
-+ -----------------
-+ -- To_Duration --
-+ -----------------
-+
-+ function To_Duration (TS : timespec) return Duration is
-+ begin
-+ return Duration (TS.tv_sec) + Duration (TS.tv_nsec) / 10#1#E9;
-+ end To_Duration;
-+
-+ ------------------------
-+ -- To_Target_Priority --
-+ ------------------------
-+
-+ function To_Target_Priority
-+ (Prio : System.Any_Priority) return Interfaces.C.int
-+ is
-+ begin
-+ return Interfaces.C.int (Prio);
-+ end To_Target_Priority;
-+
-+ -----------------
-+ -- To_Timespec --
-+ -----------------
-+
-+ function To_Timespec (D : Duration) return timespec is
-+ S : time_t;
-+ F : Duration;
-+
-+ begin
-+ S := time_t (Long_Long_Integer (D));
-+ F := D - Duration (S);
-+
-+ -- If F has negative value due to a round-up, adjust for positive F
-+ -- value.
-+
-+ if F < 0.0 then
-+ S := S - 1;
-+ F := F + 1.0;
-+ end if;
-+
-+ return timespec'(tv_sec => S,
-+ tv_nsec => long (Long_Long_Integer (F * 10#1#E9)));
-+ end To_Timespec;
-+
-+end System.OS_Interface;
---- a/src/gcc/ada/gcc-interface/Makefile.in
-+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1443,7 +1443,7 @@
- a-intnam.ads<a-intnam-freebsd.ads \
- s-inmaop.adb<s-inmaop-posix.adb \
- s-intman.adb<s-intman-posix.adb \
-- s-osinte.adb<s-osinte-posix.adb \
-+ s-osinte.adb<s-osinte-kfreebsd-gnu.adb \
- s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
- s-osprim.adb<s-osprim-posix.adb \
- s-taprop.adb<s-taprop-posix.adb \
-@@ -1503,7 +1503,7 @@
- a-numaux.ads<a-numaux-x86.ads \
- s-inmaop.adb<s-inmaop-posix.adb \
- s-intman.adb<s-intman-posix.adb \
-- s-osinte.adb<s-osinte-posix.adb \
-+ s-osinte.adb<s-osinte-kfreebsd-gnu.adb \
- s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
- s-osprim.adb<s-osprim-posix.adb \
- s-taprop.adb<s-taprop-posix.adb \
--- a/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
+++ b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
@@ -45,6 +45,7 @@
@@ -212,43 +37,36 @@
+
function pthread_mutexattr_setprotocol
(attr : access pthread_mutexattr_t;
- protocol : int) return int;
+- protocol : int) return int;
- pragma Import
- (C, pthread_mutexattr_setprotocol, "pthread_mutexattr_setprotocol");
++ protocol : int) return int is (0);
function pthread_mutexattr_getprotocol
(attr : access pthread_mutexattr_t;
- protocol : access int) return int;
+- protocol : access int) return int;
- pragma Import
- (C, pthread_mutexattr_getprotocol, "pthread_mutexattr_getprotocol");
++ protocol : access int) return int is (0);
function pthread_mutexattr_setprioceiling
(attr : access pthread_mutexattr_t;
- prioceiling : int) return int;
+- prioceiling : int) return int;
- pragma Import
- (C, pthread_mutexattr_setprioceiling,
- "pthread_mutexattr_setprioceiling");
++ prioceiling : int) return int is (0);
function pthread_mutexattr_getprioceiling
(attr : access pthread_mutexattr_t;
- prioceiling : access int) return int;
+- prioceiling : access int) return int;
- pragma Import
- (C, pthread_mutexattr_getprioceiling,
- "pthread_mutexattr_getprioceiling");
++ prioceiling : access int) return int is (0);
type struct_sched_param is record
sched_priority : int; -- scheduling priority
-@@ -592,8 +585,8 @@
- -- #define sa_handler __sigaction_u._handler
- -- #define sa_sigaction __sigaction_u._sigaction
-
-- -- Should we add a signal_context type here ?
-- -- How could it be done independent of the CPU architecture ?
-+ -- Should we add a signal_context type here ???
-+ -- How could it be done independent of the CPU architecture ???
- -- 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.
@@ -610,9 +603,6 @@
end record;
pragma Convention (C, timespec);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list