diff mbox series

ada: Fix s-taprop__solaris.adb compilation

Message ID ydd8qx8lnbm.fsf@CeBiTec.Uni-Bielefeld.DE
State Committed
Commit 82ed4d514329ed56077efda59a397784615e9c93
Headers
Series ada: Fix s-taprop__solaris.adb compilation |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Test passed

Commit Message

Rainer Orth Aug. 7, 2024, 9 a.m. UTC 
  Solaris Ada bootstrap is broken as of 2024-08-06 with

s-taprop.adb:1971:23: error: "int" is not visible
s-taprop.adb:1971:23: error: multiple use clauses cause hiding
s-taprop.adb:1971:23: error: hidden declaration at s-osinte.ads:51
s-taprop.adb:1971:23: error: hidden declaration at i-c.ads:62

because one instance of int isn't qualified.  This patch fixes this.

Bootstrapped without regressions on i386-pc-solaris2.11 and
sparc-sun-solaris2.11.

Ok for trunk?

	Rainer

Comments

Marc Poulhiès Aug. 8, 2024, 7:51 a.m. UTC | #1 
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

Hello,

> Solaris Ada bootstrap is broken as of 2024-08-06 with
>
> s-taprop.adb:1971:23: error: "int" is not visible
> s-taprop.adb:1971:23: error: multiple use clauses cause hiding
> s-taprop.adb:1971:23: error: hidden declaration at s-osinte.ads:51
> s-taprop.adb:1971:23: error: hidden declaration at i-c.ads:62
>
> because one instance of int isn't qualified.  This patch fixes this.
>
> Bootstrapped without regressions on i386-pc-solaris2.11 and
> sparc-sun-solaris2.11.
>
> Ok for trunk?

Yes, thanks!

Marc
diff mbox series

Patch

# HG changeset patch
# Parent  e1cd3c7e6ffeab6f837a999725875174ac45a9ce
ada: Fix s-taprop__solaris.adb compilation

diff --git a/gcc/ada/libgnarl/s-taprop__solaris.adb b/gcc/ada/libgnarl/s-taprop__solaris.adb
--- a/gcc/ada/libgnarl/s-taprop__solaris.adb
+++ b/gcc/ada/libgnarl/s-taprop__solaris.adb
@@ -1968,7 +1968,7 @@  package body System.Task_Primitives.Oper
       then
          declare
             CPU_Set : aliased psetid_t;
-            Result  : int;
+            Result  : Interfaces.C.int;
 
          begin
             Result := pset_create (CPU_Set'Access);