From c6c93fff61c8d5b63917cacb5a52dfa5f5408d44 Mon Sep 17 00:00:00 2001 From: ebotcazou Date: Wed, 9 Apr 2014 07:57:48 +0000 Subject: [PATCH] PR ada/60411 * s-osinte-android.ads: Adjust. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209237 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/s-osinte-android.ads | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/gcc/ada/s-osinte-android.ads b/gcc/ada/s-osinte-android.ads index 2b94f3f..310c598 100644 --- a/gcc/ada/s-osinte-android.ads +++ b/gcc/ada/s-osinte-android.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1995-2013, Free Software Foundation, Inc. -- +-- Copyright (C) 1995-2014, Free Software Foundation, Inc. -- -- -- -- GNAT 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- -- @@ -75,7 +75,7 @@ package System.OS_Interface is -- Signals -- ------------- - Max_Interrupt : constant := 63; + Max_Interrupt : constant := 31; type Signal is new int range 0 .. Max_Interrupt; for Signal'Size use int'Size; @@ -114,9 +114,6 @@ package System.OS_Interface is SIGXFSZ : constant := System.Linux.SIGXFSZ; SIGUNUSED : constant := System.Linux.SIGUNUSED; SIGSTKFLT : constant := System.Linux.SIGSTKFLT; - SIGLTHRRES : constant := System.Linux.SIGLTHRRES; - SIGLTHRCAN : constant := System.Linux.SIGLTHRCAN; - SIGLTHRDBG : constant := System.Linux.SIGLTHRDBG; SIGADAABORT : constant := SIGABRT; -- Change this to use another signal for task abort. SIGTERM might be a @@ -138,13 +135,9 @@ package System.OS_Interface is SIGPROF, -- To avoid confusing the profiler - SIGKILL, SIGSTOP, + SIGKILL, SIGSTOP); -- These two signals actually can't be masked (POSIX won't allow it) - SIGLTHRRES, SIGLTHRCAN, SIGLTHRDBG); - -- These three signals are used by GNU/LinuxThreads starting from glibc - -- 2.1 (future 2.2). - Reserved : constant Signal_Set := (SIGVTALRM, SIGUNUSED); -- Not clear why these two signals are reserved. Perhaps they are not -- supported by this version of GNU/Linux ??? @@ -187,6 +180,8 @@ package System.OS_Interface is SA_SIGINFO : constant := System.Linux.SA_SIGINFO; SA_ONSTACK : constant := System.Linux.SA_ONSTACK; + SA_NODEFER : constant := System.Linux.SA_NODEFER; + SA_RESTART : constant := System.Linux.SA_RESTART; SIG_BLOCK : constant := 0; SIG_UNBLOCK : constant := 1; @@ -580,17 +575,16 @@ package System.OS_Interface is private - type sigset_t is - -- array (0 .. OS_Constants.SIZEOF_sigset - 1) of unsigned_char; - array (1 .. 127) of unsigned_char; + type sigset_t is new Interfaces.C.unsigned_long; pragma Convention (C, sigset_t); for sigset_t'Alignment use Interfaces.C.unsigned_long'Alignment; pragma Warnings (Off); for struct_sigaction use record sa_handler at Linux.sa_handler_pos range 0 .. Standard'Address_Size - 1; - sa_mask at Linux.sa_mask_pos range 0 .. 1023; - sa_flags at Linux.sa_flags_pos range 0 .. Standard'Address_Size - 1; + sa_mask at Linux.sa_mask_pos range 0 .. sigset_t'Size - 1; + sa_flags at Linux.sa_flags_pos + range 0 .. Interfaces.C.unsigned_long'Size - 1; end record; -- We intentionally leave sa_restorer unspecified and let the compiler -- append it after the last field, so disable corresponding warning. -- 2.7.4