diff options
| author | Doug Rupp <rupp@adacore.com> | 2021-07-12 10:52:32 -0700 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-09-22 15:01:43 +0000 |
| commit | 2df3e43eb97a3d1e96485a9b682f9a07478b6da7 (patch) | |
| tree | 1dbccc387057ceb112e88e86d6479a94eb95fff1 | |
| parent | 4a3cb9e31936dda905082d9a27389c1622a3c55c (diff) | |
| download | gcc-2df3e43eb97a3d1e96485a9b682f9a07478b6da7.zip gcc-2df3e43eb97a3d1e96485a9b682f9a07478b6da7.tar.gz gcc-2df3e43eb97a3d1e96485a9b682f9a07478b6da7.tar.bz2 | |
[Ada] VxWorks inconsistent use of return type (vx_freq_t)
gcc/ada/
* libgnarl/s-osinte__vxworks.ads (SVE): New package renaming
(vx_freq_t): New subtype.
(sysClkRateGet): Return vx_freq_t.
* libgnarl/s-vxwext.ads (vx_freq_t): New type.
* libgnarl/s-vxwext__kernel.ads: Likewise.
* libgnarl/s-vxwext__rtp.ads: Likewise.
| -rw-r--r-- | gcc/ada/libgnarl/s-osinte__vxworks.ads | 4 | ||||
| -rw-r--r-- | gcc/ada/libgnarl/s-vxwext.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/libgnarl/s-vxwext__kernel.ads | 3 | ||||
| -rw-r--r-- | gcc/ada/libgnarl/s-vxwext__rtp.ads | 3 |
4 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ada/libgnarl/s-osinte__vxworks.ads b/gcc/ada/libgnarl/s-osinte__vxworks.ads index a2d5620..384cdec 100644 --- a/gcc/ada/libgnarl/s-osinte__vxworks.ads +++ b/gcc/ada/libgnarl/s-osinte__vxworks.ads @@ -57,6 +57,8 @@ package System.OS_Interface is type unsigned_long_long is mod 2 ** long_long'Size; type size_t is mod 2 ** Standard'Address_Size; + subtype vx_freq_t is System.VxWorks.Ext.vx_freq_t; + ----------- -- Errno -- ----------- @@ -312,7 +314,7 @@ package System.OS_Interface is function taskDelay (ticks : int) return int; pragma Import (C, taskDelay, "taskDelay"); - function sysClkRateGet return int; + function sysClkRateGet return vx_freq_t; pragma Import (C, sysClkRateGet, "sysClkRateGet"); -- VxWorks 5.x specific functions diff --git a/gcc/ada/libgnarl/s-vxwext.ads b/gcc/ada/libgnarl/s-vxwext.ads index 915db33..1c9847f 100644 --- a/gcc/ada/libgnarl/s-vxwext.ads +++ b/gcc/ada/libgnarl/s-vxwext.ads @@ -46,6 +46,9 @@ package System.VxWorks.Ext is subtype int is Interfaces.C.int; subtype unsigned is Interfaces.C.unsigned; + type vx_freq_t is new unsigned; + -- Equivalent of the C type _Vx_freq_t + type Interrupt_Handler is access procedure (parameter : System.Address); pragma Convention (C, Interrupt_Handler); diff --git a/gcc/ada/libgnarl/s-vxwext__kernel.ads b/gcc/ada/libgnarl/s-vxwext__kernel.ads index 3c200a1..6cecf18 100644 --- a/gcc/ada/libgnarl/s-vxwext__kernel.ads +++ b/gcc/ada/libgnarl/s-vxwext__kernel.ads @@ -45,6 +45,9 @@ package System.VxWorks.Ext is subtype int is Interfaces.C.int; subtype unsigned is Interfaces.C.unsigned; + type vx_freq_t is new unsigned; + -- Equivalent of the C type _Vx_freq_t + type Interrupt_Handler is access procedure (parameter : System.Address); pragma Convention (C, Interrupt_Handler); diff --git a/gcc/ada/libgnarl/s-vxwext__rtp.ads b/gcc/ada/libgnarl/s-vxwext__rtp.ads index d13344e..d955c9c 100644 --- a/gcc/ada/libgnarl/s-vxwext__rtp.ads +++ b/gcc/ada/libgnarl/s-vxwext__rtp.ads @@ -45,6 +45,9 @@ package System.VxWorks.Ext is subtype int is Interfaces.C.int; subtype unsigned is Interfaces.C.unsigned; + type vx_freq_t is new unsigned; + -- Equivalent of the C type _Vx_freq_t + type Interrupt_Handler is access procedure (parameter : System.Address); pragma Convention (C, Interrupt_Handler); |