From 7437c8d44912ec6db96029cb6a835821cdf85d9b Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Mon, 7 Apr 2008 12:31:41 +0000 Subject: [PATCH] sysdep.c: add __GLIBC__ to the #ifdef preprocessor macros to detect systems using GNU libc. 2008-04-07 Aurelien Jarno * sysdep.c: add __GLIBC__ to the #ifdef preprocessor macros to detect systems using GNU libc. * gsocket.h: ditto. * socket.c: ditto. * adaint.c: ditto. * link.c: ditto. From-SVN: r133979 --- gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/adaint.c | 6 +++--- gcc/ada/gsocket.h | 2 +- gcc/ada/link.c | 2 +- gcc/ada/socket.c | 8 ++++---- gcc/ada/sysdep.c | 11 +++++++---- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index c4ed0e7df24..06c0877bc7e 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2008-04-07 Aurelien Jarno + + * sysdep.c: add __GLIBC__ to the #ifdef preprocessor macros to + detect systems using GNU libc. + * gsocket.h: ditto. + * socket.c: ditto. + * adaint.c: ditto. + * link.c: ditto. + 2008-04-07 Aurelien Jarno * s-osinte-linux-kfreebsd.ads (SC_NPROCESSORS_ONLN): New diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index b65a1c7176c..72ebec7d21d 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -888,7 +888,7 @@ __gnat_open_new_temp (char *path, int fmode) strcpy (path, "GNAT-XXXXXX"); #if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) \ - || defined (linux)) && !defined (__vxworks) + || defined (linux) || defined(__GLIBC__)) && !defined (__vxworks) return mkstemp (path); #elif defined (__Lynx__) mktemp (path); @@ -981,7 +981,7 @@ __gnat_tmp_name (char *tmp_filename) } #elif defined (linux) || defined (__FreeBSD__) || defined (__NetBSD__) \ - || defined (__OpenBSD__) + || defined (__OpenBSD__) || defined(__GLIBC__) #define MAX_SAFE_PATH 1000 char *tmpdir = getenv ("TMPDIR"); @@ -3030,7 +3030,7 @@ void GetTimeAsFileTime(LPFILETIME pTime) } #endif -#if defined (linux) +#if defined (linux) || defined(__GLIBC__) /* pthread affinity support */ int __gnat_pthread_setaffinity_np (pthread_t th, diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h index bfdf1233cee..ce4d47801d6 100644 --- a/gcc/ada/gsocket.h +++ b/gcc/ada/gsocket.h @@ -175,7 +175,7 @@ #if defined (_AIX) || defined (__FreeBSD__) || defined (__hpux__) || defined (__osf__) || defined (_WIN32) || defined (__APPLE__) # define HAVE_THREAD_SAFE_GETxxxBYyyy 1 -#elif defined (sgi) || defined (linux) || (defined (sun) && defined (__SVR4) && !defined (__vxworks)) +#elif defined (sgi) || defined (linux) || defined (__GLIBC__) || (defined (sun) && defined (__SVR4) && !defined (__vxworks)) # define HAVE_GETxxxBYyyy_R 1 #endif diff --git a/gcc/ada/link.c b/gcc/ada/link.c index 7e941d19cab..1ed24f80588 100644 --- a/gcc/ada/link.c +++ b/gcc/ada/link.c @@ -153,7 +153,7 @@ unsigned char __gnat_objlist_file_supported = 1; unsigned char __gnat_using_gnu_linker = 1; const char *__gnat_object_library_extension = ".a"; -#elif defined (linux) +#elif defined (linux) || defined(__GLIBC__) const char *__gnat_object_file_option = ""; const char *__gnat_run_path_option = "-Wl,-rpath,"; char __gnat_shared_libgnat_default = STATIC; diff --git a/gcc/ada/socket.c b/gcc/ada/socket.c index 913d1ca40f6..53620c4e1a7 100644 --- a/gcc/ada/socket.c +++ b/gcc/ada/socket.c @@ -206,7 +206,7 @@ __gnat_safe_gethostbyname (const char *name, struct hostent *rh; int ri; -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) (void) gethostbyname_r (name, ret, buf, buflen, &rh, h_errnop); #else rh = gethostbyname_r (name, ret, buf, buflen, h_errnop); @@ -223,7 +223,7 @@ __gnat_safe_gethostbyaddr (const char *addr, int len, int type, struct hostent *rh; int ri; -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) (void) gethostbyaddr_r (addr, len, type, ret, buf, buflen, &rh, h_errnop); #else rh = gethostbyaddr_r (addr, len, type, ret, buf, buflen, h_errnop); @@ -239,7 +239,7 @@ __gnat_safe_getservbyname (const char *name, const char *proto, struct servent *rh; int ri; -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) (void) getservbyname_r (name, proto, ret, buf, buflen, &rh); #else rh = getservbyname_r (name, proto, ret, buf, buflen); @@ -255,7 +255,7 @@ __gnat_safe_getservbyport (int port, const char *proto, struct servent *rh; int ri; -#ifdef __linux__ +#if defined(__linux__) || defined(__GLIBC__) (void) getservbyport_r (port, proto, ret, buf, buflen, &rh); #else rh = getservbyport_r (port, proto, ret, buf, buflen); diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index cf51ebea76a..f0394aaab92 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -342,7 +342,8 @@ __gnat_ttyname (int filedes) || (defined (__osf__) && ! defined (__alpha_vxworks)) || defined (WINNT) \ || defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \ || (defined (__svr4__) && defined (i386)) || defined (__Lynx__) \ - || defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) + || defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ + || defined (__GLIBC__) #ifdef __MINGW32__ #if OLD_MINGW @@ -399,7 +400,8 @@ getc_immediate_common (FILE *stream, || (defined (__osf__) && ! defined (__alpha_vxworks)) \ || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \ - || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) + || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ + || defined (__GLIBC__) char c; int nread; int good_one = 0; @@ -418,7 +420,8 @@ getc_immediate_common (FILE *stream, #if defined(linux) || defined (sun) || defined (sgi) || defined (__EMX__) \ || defined (__osf__) || defined (__MACHTEN__) || defined (__hpux__) \ || defined (_AIX) || (defined (__svr4__) && defined (i386)) \ - || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) + || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \ + || defined (__GLIBC__) eof_ch = termios_rec.c_cc[VEOF]; /* If waiting (i.e. Get_Immediate (Char)), set MIN = 1 and wait for @@ -845,7 +848,7 @@ __gnat_localtime_tzoff (const time_t *timer, struct tm *tp, long *off) /* Darwin, Free BSD, Linux, Tru64, where there exists a component tm_gmtoff in struct tm */ #elif defined (__APPLE__) || defined (__FreeBSD__) || defined (linux) ||\ - (defined (__alpha__) && defined (__osf__)) + (defined (__alpha__) && defined (__osf__)) || defined (__GLIBC__) *off = tp->tm_gmtoff; /* All other platforms: Treat all time values in GMT */ -- 2.30.2