From 593e0eba77594774db054cd98b879fbe1ffa29cc Mon Sep 17 00:00:00 2001 From: Patrick Bernardi Date: Mon, 19 Aug 2019 08:36:26 +0000 Subject: [PATCH] [Ada] Enable use of GNAT.Sockets for VxWorks RTP The recent introduction of GNAT.Sockets IPv6 support broke support for VxWorks RTPs due to the use of internal VxWorks kernel calls. This patch rectifies this by using the VxWorks public API for these routines. The following RTP should compile successfully on a Development profile VxWorks kernel that includes the INCLUDE_GETNAMEINFO component: with GNAT.Sockets; use GNAT.Sockets; procedure IPvX is procedure Print_Address_Info (Host, Serv : String; Family : Family_Type := Family_Unspec) is Addresses : Address_Info_Array := Get_Address_Info (Host, Serv, Family, Passive => False, Numeric_Host => False); begin Sort (Addresses, IPv6_TCP_Preferred'Access); end Print_Address_Info; begin Print_Address_Info ("localhost", "ssh"); end IPvX; 2019-08-19 Patrick Bernardi gcc/ada/ * socket.c: Removed the redefinition of getaddrinfo, getnameinfo and freeaddrinfo to internal VxWorks kernel calls because they are, well, internal kernel calls and cannot be called from RTPs. VxWorks provides the necessary components to call these routines directly. From-SVN: r274651 --- gcc/ada/ChangeLog | 8 ++++++++ gcc/ada/socket.c | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5d48b3d31d1..f89468e1d90 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2019-08-19 Patrick Bernardi + + * socket.c: Removed the redefinition of getaddrinfo, getnameinfo + and freeaddrinfo to internal VxWorks kernel calls because they + are, well, internal kernel calls and cannot be called from RTPs. + VxWorks provides the necessary components to call these routines + directly. + 2019-08-19 Eric Botcazou * exp_dist.adb (Is_Generic_Actual_Subtype): New predicate. diff --git a/gcc/ada/socket.c b/gcc/ada/socket.c index 8fc8415ddc1..94538d43082 100644 --- a/gcc/ada/socket.c +++ b/gcc/ada/socket.c @@ -704,12 +704,6 @@ __gnat_servent_s_proto (struct servent * s) #if defined(AF_INET6) && !defined(__rtems__) -#if defined (__vxworks) -#define getaddrinfo ipcom_getaddrinfo -#define getnameinfo ipcom_getnameinfo -#define freeaddrinfo ipcom_freeaddrinfo -#endif - int __gnat_getaddrinfo( const char *node, const char *service, -- 2.30.2