diff options
| author | Rong Xu <xur@google.com> | 2014-09-02 15:29:57 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-09-02 15:29:57 -0700 |
| commit | e97c99f15937e5762a973b25192aab824126a6d3 (patch) | |
| tree | 7f0be3ff7c7d976af06887dc50accd68f7630a7f /gcc-4.9/gcc/ada | |
| parent | f1c18afafc2b321465ae6b07ede127095942d7dc (diff) | |
| download | toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.tar.gz toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.tar.bz2 toolchain_gcc-e97c99f15937e5762a973b25192aab824126a6d3.zip | |
[gcc-4.9] Merge svn r214745 from google/gcc-4_9 branch.
Merge gcc-4_9 source r214745 from google/gcc-4_9 branch.
Change-Id: Ie6fa0fd72f4b4eec3adc4db4bb922e652d1c2605
Diffstat (limited to 'gcc-4.9/gcc/ada')
| -rw-r--r-- | gcc-4.9/gcc/ada/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc-4.9/gcc/ada/gsocket.h | 5 | ||||
| -rw-r--r-- | gcc-4.9/gcc/ada/s-osinte-rtems.adb | 2 | ||||
| -rw-r--r-- | gcc-4.9/gcc/ada/socket.c | 2 |
4 files changed, 16 insertions, 2 deletions
diff --git a/gcc-4.9/gcc/ada/ChangeLog b/gcc-4.9/gcc/ada/ChangeLog index 27d4ad7cb..c8c4d807b 100644 --- a/gcc-4.9/gcc/ada/ChangeLog +++ b/gcc-4.9/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2014-08-12 Joel Sherrill <joel.sherrill@oarcorp.com> + + * socket.c: For RTEMS, use correct prototype of gethostbyname_r(). + * gsocket.h Add include of <unistd.h> on RTEMS. + +2014-08-11 Joel Sherrill <joel.sherrill@oarcorp.com> + + * s-osinte-rtems.adb: Correct formatting of line in license block. + 2014-07-16 Release Manager * GCC 4.9.1 released. diff --git a/gcc-4.9/gcc/ada/gsocket.h b/gcc-4.9/gcc/ada/gsocket.h index e21d71427..1d9235f4a 100644 --- a/gcc-4.9/gcc/ada/gsocket.h +++ b/gcc-4.9/gcc/ada/gsocket.h @@ -183,6 +183,11 @@ #include <sys/time.h> #endif +#if defined(__rtems__) +#include <unistd.h> +/* Required, for read(), write(), and close() */ +#endif + /* * RTEMS has these .h files but not until you have built and installed RTEMS. * When building a C/C++ toolset, you also build the newlib C library, so the diff --git a/gcc-4.9/gcc/ada/s-osinte-rtems.adb b/gcc-4.9/gcc/ada/s-osinte-rtems.adb index de2178594..9f01128c9 100644 --- a/gcc-4.9/gcc/ada/s-osinte-rtems.adb +++ b/gcc-4.9/gcc/ada/s-osinte-rtems.adb @@ -22,7 +22,7 @@ -- You should have received a copy of the GNU General Public License and -- -- a copy of the GCC Runtime Library Exception along with this program; -- -- see the files COPYING3 and COPYING.RUNTIME respectively. If not, see -- --- <http://www.gnu.org/licenses/>. +-- <http://www.gnu.org/licenses/>. -- -- -- -- GNARL was developed by the GNARL team at Florida State University. It is -- -- now maintained by Ada Core Technologies Inc. in cooperation with Florida -- diff --git a/gcc-4.9/gcc/ada/socket.c b/gcc-4.9/gcc/ada/socket.c index 18999b394..e65845628 100644 --- a/gcc-4.9/gcc/ada/socket.c +++ b/gcc-4.9/gcc/ada/socket.c @@ -212,7 +212,7 @@ __gnat_gethostbyname (const char *name, struct hostent *rh; int ri; -#if defined(__linux__) || defined(__GLIBC__) +#if defined(__linux__) || defined(__GLIBC__) || defined(__rtems__) (void) gethostbyname_r (name, ret, buf, buflen, &rh, h_errnop); #else rh = gethostbyname_r (name, ret, buf, buflen, h_errnop); |