diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2024-05-21 11:11:02 +0200 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@adacore.com> | 2024-05-21 11:12:34 +0200 |
| commit | 7b215c867629e095a4ac403bd026b6eb293962b4 (patch) | |
| tree | c76256e81c9a57f54cc1b7e6542877f7af13b17c /gcc/ada | |
| parent | ec9b8bafe20755d13ab9a1b834b5da79ae972c0e (diff) | |
| download | gcc-7b215c867629e095a4ac403bd026b6eb293962b4.zip gcc-7b215c867629e095a4ac403bd026b6eb293962b4.tar.gz gcc-7b215c867629e095a4ac403bd026b6eb293962b4.tar.bz2 | |
Fix Ada runtime library breakage on Solaris (bis)
Recent changes made to the runtime library broke again its build on Solaris
because it uses Solaris threads instead of POSIX threads on this platform.
gcc/ada/
PR ada/115168
* libgnarl/s-taprop__solaris.adb (Initialize): Fix pasto.
* libgnat/s-oslock__solaris.ads (Owner_Int): Delete.
(Owner_ID): Change the designated type to Integer.
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/libgnarl/s-taprop__solaris.adb | 2 | ||||
| -rw-r--r-- | gcc/ada/libgnat/s-oslock__solaris.ads | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/gcc/ada/libgnarl/s-taprop__solaris.adb b/gcc/ada/libgnarl/s-taprop__solaris.adb index 09f90e6..6d05e8db 100644 --- a/gcc/ada/libgnarl/s-taprop__solaris.adb +++ b/gcc/ada/libgnarl/s-taprop__solaris.adb @@ -424,7 +424,7 @@ package body System.Task_Primitives.Operations is begin Environment_Task_Id := Environment_Task; - Self_ID.Common.LL.Thread := thr_self; + Environment_Task.Common.LL.Thread := thr_self; Interrupt_Management.Initialize; diff --git a/gcc/ada/libgnat/s-oslock__solaris.ads b/gcc/ada/libgnat/s-oslock__solaris.ads index cc5a83d..56a242c 100644 --- a/gcc/ada/libgnat/s-oslock__solaris.ads +++ b/gcc/ada/libgnat/s-oslock__solaris.ads @@ -42,10 +42,7 @@ package System.OS_Locks is type Private_Task_Serial_Number is mod 2 ** Long_Long_Integer'Size; -- Used to give each task a unique serial number - type Owner_Int is new Integer; - for Owner_Int'Alignment use Standard'Maximum_Alignment; - - type Owner_ID is access all Owner_Int; + type Owner_ID is access all Integer; function To_Owner_ID is new Ada.Unchecked_Conversion (System.Address, Owner_ID); |