re PR ada/60411 (Ada bootstrap failure on ARM)
PR ada/60411 * gcc-interface/Makefile.in (arm% linux-android): Switch to EHABI. * s-linux-android.ads: New file. * s-intman-android.adb: Likewise. From-SVN: r209210
This commit is contained in:
Eric Botcazou
Eric Botcazou
parent
0439a94767
commit
f3d6c7cb76
|
|
@ -1,3 +1,10 @@
|
|||
2014-04-08 Eric Botcazou <ebotcazou@adacore.com>
|
||||
|
||||
PR ada/60411
|
||||
* gcc-interface/Makefile.in (arm% linux-android): Switch to EHABI.
|
||||
* s-linux-android.ads: New file.
|
||||
* s-intman-android.adb: Likewise.
|
||||
|
||||
2014-04-07 Eric Botcazou <ebotcazou@adacore.com>
|
||||
|
||||
* gcc-interface/Makefile.in (alpha-vms): Add missing line.
|
||||
|
|
|
|||
|
|
@ -1045,15 +1045,17 @@ ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)
|
|||
LIBGNAT_TARGET_PAIRS = \
|
||||
a-intnam.ads<a-intnam-linux.ads \
|
||||
s-inmaop.adb<s-inmaop-posix.adb \
|
||||
s-intman.adb<s-intman-posix.adb \
|
||||
s-linux.ads<s-linux.ads \
|
||||
s-intman.adb<s-intman-android.adb \
|
||||
s-linux.ads<s-linux-android.ads \
|
||||
s-osinte.adb<s-osinte-android.adb \
|
||||
s-osinte.ads<s-osinte-android.ads \
|
||||
s-osprim.adb<s-osprim-posix.adb \
|
||||
s-taprop.adb<s-taprop-posix.adb \
|
||||
s-taspri.ads<s-taspri-posix-noaltstack.ads \
|
||||
s-taspri.ads<s-taspri-posix.ads \
|
||||
s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
|
||||
system.ads<system-linux-armel.ads \
|
||||
a-exexpr.adb<a-exexpr-gcc.adb \
|
||||
s-excmac.ads<s-excmac-arm.ads \
|
||||
$(DUMMY_SOCKETS_TARGET_PAIRS)
|
||||
|
||||
TOOLS_TARGET_PAIRS = \
|
||||
|
|
@ -1062,7 +1064,9 @@ ifeq ($(strip $(filter-out arm% linux-androideabi,$(target_cpu) $(target_os))),)
|
|||
|
||||
GNATRTL_SOCKETS_OBJS =
|
||||
EXTRA_GNATRTL_TASKING_OBJS=s-linux.o
|
||||
EH_MECHANISM=
|
||||
EXTRA_LIBGNAT_OBJS+=raise-gcc.o
|
||||
EXTRA_GNATRTL_NONTASKING_OBJS+=g-cppexc.o s-excmac.o
|
||||
EH_MECHANISM=-arm
|
||||
THREADSLIB =
|
||||
GNATLIB_SHARED = gnatlib-shared-dual
|
||||
LIBRARY_VERSION := $(LIB_VERSION)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,331 @@
|
|||
------------------------------------------------------------------------------
|
||||
-- --
|
||||
-- GNAT RUN-TIME LIBRARY (GNARL) COMPONENTS --
|
||||
-- --
|
||||
-- S Y S T E M . I N T E R R U P T _ M A N A G E M E N T --
|
||||
-- --
|
||||
-- B o d y --
|
||||
-- --
|
||||
-- Copyright (C) 2014, Free Software Foundation, Inc. --
|
||||
-- --
|
||||
-- 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 3, or (at your option) any later ver- --
|
||||
-- sion. GNAT 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. --
|
||||
-- --
|
||||
-- As a special exception under Section 7 of GPL version 3, you are granted --
|
||||
-- additional permissions described in the GCC Runtime Library Exception, --
|
||||
-- version 3.1, as published by the Free Software Foundation. --
|
||||
-- --
|
||||
-- In particular, you can freely distribute your programs built with the --
|
||||
-- GNAT Pro compiler, including any required library run-time units, using --
|
||||
-- any licensing terms of your choosing. See the AdaCore Software License --
|
||||
-- for full details. --
|
||||
-- --
|
||||
-- GNARL was developed by the GNARL team at Florida State University. --
|
||||
-- Extensive contributions were provided by Ada Core Technologies, Inc. --
|
||||
-- --
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
-- This is the Android version of this package
|
||||
|
||||
-- Make a careful study of all signals available under the OS, to see which
|
||||
-- need to be reserved, kept always unmasked, or kept always unmasked. Be on
|
||||
-- the lookout for special signals that may be used by the thread library.
|
||||
|
||||
-- Since this is a multi target file, the signal <-> exception mapping
|
||||
-- is simple minded. If you need a more precise and target specific
|
||||
-- signal handling, create a new s-intman.adb that will fit your needs.
|
||||
|
||||
-- This file assumes that:
|
||||
|
||||
-- SIGFPE, SIGILL, SIGSEGV and SIGBUS exist. They are mapped as follows:
|
||||
-- SIGPFE => Constraint_Error
|
||||
-- SIGILL => Program_Error
|
||||
-- SIGSEGV => Storage_Error
|
||||
-- SIGBUS => Storage_Error
|
||||
|
||||
-- SIGINT exists and will be kept unmasked unless the pragma
|
||||
-- Unreserve_All_Interrupts is specified anywhere in the application.
|
||||
|
||||
-- System.OS_Interface contains the following:
|
||||
-- SIGADAABORT: the signal that will be used to abort tasks.
|
||||
-- Unmasked: the OS specific set of signals that should be unmasked in
|
||||
-- all the threads. SIGADAABORT is unmasked by
|
||||
-- default
|
||||
-- Reserved: the OS specific set of signals that are reserved.
|
||||
|
||||
with System.Task_Primitives;
|
||||
|
||||
package body System.Interrupt_Management is
|
||||
|
||||
use Interfaces.C;
|
||||
use System.OS_Interface;
|
||||
|
||||
type Interrupt_List is array (Interrupt_ID range <>) of Interrupt_ID;
|
||||
Exception_Interrupts : constant Interrupt_List :=
|
||||
(SIGFPE, SIGILL, SIGSEGV, SIGBUS);
|
||||
|
||||
Unreserve_All_Interrupts : Interfaces.C.int;
|
||||
pragma Import
|
||||
(C, Unreserve_All_Interrupts, "__gl_unreserve_all_interrupts");
|
||||
|
||||
-----------------------
|
||||
-- Local Subprograms --
|
||||
-----------------------
|
||||
|
||||
procedure Signal_Trampoline
|
||||
(signo : Signal;
|
||||
siginfo : System.Address;
|
||||
ucontext : System.Address;
|
||||
handler : System.Address);
|
||||
pragma Import (C, Signal_Trampoline, "__gnat_sigtramp");
|
||||
-- Pass the real handler to a speical function that handles unwinding by
|
||||
-- skipping over the kernel signal frame (which doesn't contain any unwind
|
||||
-- information).
|
||||
|
||||
function State (Int : Interrupt_ID) return Character;
|
||||
pragma Import (C, State, "__gnat_get_interrupt_state");
|
||||
-- Get interrupt state. Defined in init.c The input argument is the
|
||||
-- interrupt number, and the result is one of the following:
|
||||
|
||||
procedure Map_Signal
|
||||
(signo : Signal;
|
||||
siginfo : System.Address;
|
||||
ucontext : System.Address);
|
||||
-- This function identifies the Ada exception to be raised using the
|
||||
-- information when the system received a synchronous signal.
|
||||
|
||||
----------------
|
||||
-- Map_Signal --
|
||||
----------------
|
||||
|
||||
procedure Map_Signal
|
||||
(signo : Signal;
|
||||
siginfo : System.Address;
|
||||
ucontext : System.Address)
|
||||
is
|
||||
pragma Unreferenced (siginfo);
|
||||
pragma Unreferenced (ucontext);
|
||||
|
||||
begin
|
||||
|
||||
-- Check that treatment of exception propagation here is consistent with
|
||||
-- treatment of the abort signal in System.Task_Primitives.Operations.
|
||||
|
||||
case signo is
|
||||
when SIGFPE =>
|
||||
raise Constraint_Error;
|
||||
when SIGILL =>
|
||||
raise Program_Error;
|
||||
when SIGSEGV =>
|
||||
raise Storage_Error;
|
||||
when SIGBUS =>
|
||||
raise Storage_Error;
|
||||
when others =>
|
||||
null;
|
||||
end case;
|
||||
end Map_Signal;
|
||||
|
||||
----------------------
|
||||
-- Notify_Exception --
|
||||
----------------------
|
||||
|
||||
User : constant Character := 'u';
|
||||
Runtime : constant Character := 'r';
|
||||
Default : constant Character := 's';
|
||||
-- 'n' this interrupt not set by any Interrupt_State pragma
|
||||
-- 'u' Interrupt_State pragma set state to User
|
||||
-- 'r' Interrupt_State pragma set state to Runtime
|
||||
-- 's' Interrupt_State pragma set state to System (use "default"
|
||||
-- system handler)
|
||||
|
||||
procedure Notify_Exception
|
||||
(signo : Signal;
|
||||
siginfo : System.Address;
|
||||
ucontext : System.Address);
|
||||
-- This function is the signal handler and calls a trampoline subprogram
|
||||
-- that adjusts the unwind information so the ARM unwinder can find it's
|
||||
-- way back to the context of the originating subprogram. Compare with
|
||||
-- __gnat_error_handler for non-tasking programs.
|
||||
|
||||
----------------------
|
||||
-- Notify_Exception --
|
||||
----------------------
|
||||
|
||||
Signal_Mask : aliased sigset_t;
|
||||
-- The set of signals handled by Notify_Exception
|
||||
|
||||
procedure Notify_Exception
|
||||
(signo : Signal;
|
||||
siginfo : System.Address;
|
||||
ucontext : System.Address)
|
||||
is
|
||||
Result : Interfaces.C.int;
|
||||
|
||||
begin
|
||||
-- With the __builtin_longjmp, the signal mask is not restored, so we
|
||||
-- need to restore it explicitly. ??? We don't use __builtin_longjmp
|
||||
-- anymore, so do we still need this? */
|
||||
|
||||
Result := pthread_sigmask (SIG_UNBLOCK, Signal_Mask'Access, null);
|
||||
pragma Assert (Result = 0);
|
||||
|
||||
-- Perform the necessary context adjustments prior to calling the
|
||||
-- trampoline subprogram with the "real" signal handler.
|
||||
|
||||
Adjust_Context_For_Raise (signo, ucontext);
|
||||
|
||||
Signal_Trampoline (signo, siginfo, ucontext, Map_Signal'Address);
|
||||
end Notify_Exception;
|
||||
|
||||
----------------
|
||||
-- Initialize --
|
||||
----------------
|
||||
|
||||
Initialized : Boolean := False;
|
||||
|
||||
procedure Initialize is
|
||||
act : aliased struct_sigaction;
|
||||
old_act : aliased struct_sigaction;
|
||||
Result : System.OS_Interface.int;
|
||||
|
||||
Use_Alternate_Stack : constant Boolean :=
|
||||
System.Task_Primitives.Alternate_Stack_Size /= 0;
|
||||
-- Whether to use an alternate signal stack for stack overflows
|
||||
|
||||
begin
|
||||
if Initialized then
|
||||
return;
|
||||
end if;
|
||||
|
||||
Initialized := True;
|
||||
|
||||
-- Need to call pthread_init very early because it is doing signal
|
||||
-- initializations.
|
||||
|
||||
pthread_init;
|
||||
|
||||
Abort_Task_Interrupt := SIGADAABORT;
|
||||
|
||||
act.sa_handler := Notify_Exception'Address;
|
||||
|
||||
-- Setting SA_SIGINFO asks the kernel to pass more than just the signal
|
||||
-- number argument to the handler when it is called. The set of extra
|
||||
-- parameters includes a pointer to the interrupted context, which the
|
||||
-- ZCX propagation scheme needs.
|
||||
|
||||
-- Most man pages for sigaction mention that sa_sigaction should be set
|
||||
-- instead of sa_handler when SA_SIGINFO is on. In practice, the two
|
||||
-- fields are actually union'ed and located at the same offset.
|
||||
|
||||
-- On some targets, we set sa_flags to SA_NODEFER so that during the
|
||||
-- handler execution we do not change the Signal_Mask to be masked for
|
||||
-- the Signal.
|
||||
|
||||
-- This is a temporary fix to the problem that the Signal_Mask is not
|
||||
-- restored after the exception (longjmp) from the handler. The right
|
||||
-- fix should be made in sigsetjmp so that we save the Signal_Set and
|
||||
-- restore it after a longjmp.
|
||||
|
||||
-- We set SA_NODEFER to be compatible with what is done in
|
||||
-- __gnat_error_handler.
|
||||
|
||||
Result := sigemptyset (Signal_Mask'Access);
|
||||
pragma Assert (Result = 0);
|
||||
|
||||
-- Add signals that map to Ada exceptions to the mask
|
||||
|
||||
for J in Exception_Interrupts'Range loop
|
||||
if State (Exception_Interrupts (J)) /= Default then
|
||||
Result :=
|
||||
sigaddset
|
||||
(Signal_Mask'Access, Signal (Exception_Interrupts (J)));
|
||||
pragma Assert (Result = 0);
|
||||
end if;
|
||||
end loop;
|
||||
|
||||
act.sa_mask := Signal_Mask;
|
||||
|
||||
pragma Assert (Keep_Unmasked = (Interrupt_ID'Range => False));
|
||||
pragma Assert (Reserve = (Interrupt_ID'Range => False));
|
||||
|
||||
-- Process state of exception signals
|
||||
|
||||
for J in Exception_Interrupts'Range loop
|
||||
if State (Exception_Interrupts (J)) /= User then
|
||||
Keep_Unmasked (Exception_Interrupts (J)) := True;
|
||||
Reserve (Exception_Interrupts (J)) := True;
|
||||
|
||||
if State (Exception_Interrupts (J)) /= Default then
|
||||
act.sa_flags := SA_NODEFER + SA_RESTART + SA_SIGINFO;
|
||||
|
||||
if Use_Alternate_Stack
|
||||
and then Exception_Interrupts (J) = SIGSEGV
|
||||
then
|
||||
act.sa_flags := act.sa_flags + SA_ONSTACK;
|
||||
end if;
|
||||
|
||||
Result :=
|
||||
sigaction
|
||||
(Signal (Exception_Interrupts (J)), act'Unchecked_Access,
|
||||
old_act'Unchecked_Access);
|
||||
pragma Assert (Result = 0);
|
||||
end if;
|
||||
end if;
|
||||
end loop;
|
||||
|
||||
if State (Abort_Task_Interrupt) /= User then
|
||||
Keep_Unmasked (Abort_Task_Interrupt) := True;
|
||||
Reserve (Abort_Task_Interrupt) := True;
|
||||
end if;
|
||||
|
||||
-- Set SIGINT to unmasked state as long as it is not in "User" state.
|
||||
-- Check for Unreserve_All_Interrupts last.
|
||||
|
||||
if State (SIGINT) /= User then
|
||||
Keep_Unmasked (SIGINT) := True;
|
||||
Reserve (SIGINT) := True;
|
||||
end if;
|
||||
|
||||
-- Check all signals for state that requires keeping them unmasked and
|
||||
-- reserved.
|
||||
|
||||
for J in Interrupt_ID'Range loop
|
||||
if State (J) = Default or else State (J) = Runtime then
|
||||
Keep_Unmasked (J) := True;
|
||||
Reserve (J) := True;
|
||||
end if;
|
||||
end loop;
|
||||
|
||||
-- Add the set of signals that must always be unmasked for this target
|
||||
|
||||
for J in Unmasked'Range loop
|
||||
Keep_Unmasked (Interrupt_ID (Unmasked (J))) := True;
|
||||
Reserve (Interrupt_ID (Unmasked (J))) := True;
|
||||
end loop;
|
||||
|
||||
-- Add target-specific reserved signals
|
||||
|
||||
for J in Reserved'Range loop
|
||||
Reserve (Interrupt_ID (Reserved (J))) := True;
|
||||
end loop;
|
||||
|
||||
-- Process pragma Unreserve_All_Interrupts. This overrides any settings
|
||||
-- due to pragma Interrupt_State:
|
||||
|
||||
if Unreserve_All_Interrupts /= 0 then
|
||||
Keep_Unmasked (SIGINT) := False;
|
||||
Reserve (SIGINT) := False;
|
||||
end if;
|
||||
|
||||
-- We do not really have Signal 0. We just use this value to identify
|
||||
-- non-existent signals (see s-intnam.ads). Therefore, Signal should not
|
||||
-- be used in all signal related operations hence mark it as reserved.
|
||||
|
||||
Reserve (0) := True;
|
||||
end Initialize;
|
||||
|
||||
end System.Interrupt_Management;
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
------------------------------------------------------------------------------
|
||||
-- --
|
||||
-- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS --
|
||||
-- --
|
||||
-- S Y S T E M . L I N U X --
|
||||
-- --
|
||||
-- S p e c --
|
||||
-- --
|
||||
-- Copyright (C) 2014, Free Software Foundation, Inc. --
|
||||
-- --
|
||||
-- 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 3, or (at your option) any later ver- --
|
||||
-- sion. GNAT 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. --
|
||||
-- --
|
||||
-- As a special exception under Section 7 of GPL version 3, you are granted --
|
||||
-- additional permissions described in the GCC Runtime Library Exception, --
|
||||
-- version 3.1, as published by the Free Software Foundation. --
|
||||
-- --
|
||||
-- In particular, you can freely distribute your programs built with the --
|
||||
-- GNAT Pro compiler, including any required library run-time units, using --
|
||||
-- any licensing terms of your choosing. See the AdaCore Software License --
|
||||
-- for full details. --
|
||||
-- --
|
||||
-- --
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
-- This is the Android version of this package
|
||||
|
||||
-- This package encapsulates cpu specific differences between implementations
|
||||
-- of GNU/Linux, in order to share s-osinte-linux.ads.
|
||||
|
||||
-- PLEASE DO NOT add any with-clauses to this package or remove the pragma
|
||||
-- Preelaborate. This package is designed to be a bottom-level (leaf) package
|
||||
|
||||
package System.Linux is
|
||||
pragma Preelaborate;
|
||||
|
||||
------------
|
||||
-- time_t --
|
||||
------------
|
||||
|
||||
type time_t is new Long_Integer;
|
||||
|
||||
-----------
|
||||
-- Errno --
|
||||
-----------
|
||||
|
||||
EAGAIN : constant := 11;
|
||||
EINTR : constant := 4;
|
||||
EINVAL : constant := 22;
|
||||
ENOMEM : constant := 12;
|
||||
EPERM : constant := 1;
|
||||
ETIMEDOUT : constant := 110;
|
||||
|
||||
-------------
|
||||
-- Signals --
|
||||
-------------
|
||||
|
||||
SIGHUP : constant := 1; -- hangup
|
||||
SIGINT : constant := 2; -- interrupt (rubout)
|
||||
SIGQUIT : constant := 3; -- quit (ASCD FS)
|
||||
SIGILL : constant := 4; -- illegal instruction (not reset)
|
||||
SIGTRAP : constant := 5; -- trace trap (not reset)
|
||||
SIGIOT : constant := 6; -- IOT instruction
|
||||
SIGABRT : constant := 6; -- used by abort, replace SIGIOT in the future
|
||||
SIGFPE : constant := 8; -- floating point exception
|
||||
SIGKILL : constant := 9; -- kill (cannot be caught or ignored)
|
||||
SIGBUS : constant := 7; -- bus error
|
||||
SIGSEGV : constant := 11; -- segmentation violation
|
||||
SIGPIPE : constant := 13; -- write on a pipe with no one to read it
|
||||
SIGALRM : constant := 14; -- alarm clock
|
||||
SIGTERM : constant := 15; -- software termination signal from kill
|
||||
SIGUSR1 : constant := 10; -- user defined signal 1
|
||||
SIGUSR2 : constant := 12; -- user defined signal 2
|
||||
SIGCLD : constant := 17; -- alias for SIGCHLD
|
||||
SIGCHLD : constant := 17; -- child status change
|
||||
SIGPWR : constant := 30; -- power-fail restart
|
||||
SIGWINCH : constant := 28; -- window size change
|
||||
SIGURG : constant := 23; -- urgent condition on IO channel
|
||||
SIGPOLL : constant := 29; -- pollable event occurred
|
||||
SIGIO : constant := 29; -- I/O now possible (4.2 BSD)
|
||||
SIGLOST : constant := 29; -- File lock lost
|
||||
SIGSTOP : constant := 19; -- stop (cannot be caught or ignored)
|
||||
SIGTSTP : constant := 20; -- user stop requested from tty
|
||||
SIGCONT : constant := 18; -- stopped process has been continued
|
||||
SIGTTIN : constant := 21; -- background tty read attempted
|
||||
SIGTTOU : constant := 22; -- background tty write attempted
|
||||
SIGVTALRM : constant := 26; -- virtual timer expired
|
||||
SIGPROF : constant := 27; -- profiling timer expired
|
||||
SIGXCPU : constant := 24; -- CPU time limit exceeded
|
||||
SIGXFSZ : constant := 25; -- filesize limit exceeded
|
||||
SIGUNUSED : constant := 31; -- unused signal (GNU/Linux)
|
||||
SIGSTKFLT : constant := 16; -- coprocessor stack fault (Linux)
|
||||
SIGLTHRRES : constant := 32; -- GNU/LinuxThreads restart signal
|
||||
SIGLTHRCAN : constant := 33; -- GNU/LinuxThreads cancel signal
|
||||
SIGLTHRDBG : constant := 34; -- GNU/LinuxThreads debugger signal
|
||||
|
||||
-- struct_sigaction offsets
|
||||
|
||||
sa_handler_pos : constant := 0;
|
||||
sa_mask_pos : constant := Standard'Address_Size / 8;
|
||||
sa_flags_pos : constant := 4 + sa_mask_pos;
|
||||
|
||||
SA_SIGINFO : constant := 16#00000004#;
|
||||
SA_ONSTACK : constant := 16#08000000#;
|
||||
SA_RESTART : constant := 16#10000000#;
|
||||
SA_NODEFER : constant := 16#40000000#;
|
||||
|
||||
end System.Linux;
|
||||
Loading…
Reference in New Issue