> 2015-05-30 Eric Botcazou <ebotca...@adacore.com>
>
> * adaint.c: Test for __linux__ instead of linux and __sun__ instead
> of sun. Add missing leading underscore to AIX. Remove #elif 0.
> * adaint.h: Likewise.
> * cio.c: Likewise.
> * cstreams.c: Likewise.
> * env.c: Likewise.
> * gsocket.h: Likewise.
> * init.c: Likewise. Test for __i386__ instead of i386.
> * link.c: Likewise.
> * s-oscons-tmplt.c: Likewise.
> * sysdep.c: Likewise.
> * terminals.c: Likewise. Use BSD symbol instead of FREEBSD.
> * tracebak.c: Likewise. Test for __sparc__ instead of sparc.
There was a hidden subtlety: s-oscons-tmplt.c tested both for linux and
__linux__ and the former but not the latter was undefined for Android.
Tested on x86_64-suse-linux, applied on the mainline.
2015-05-31 Eric Botcazou <ebotca...@adacore.com>
* s-oscons-tmplt.c: Add explicit tests for Android alongside Linux.
--
Eric BotcazouIndex: s-oscons-tmplt.c
===================================================================
--- s-oscons-tmplt.c (revision 223897)
+++ s-oscons-tmplt.c (working copy)
@@ -86,7 +86,7 @@ pragma Style_Checks ("M32766");
** a number of non-POSIX but useful/required features.
**/
-#if defined (__linux__)
+#if defined (__linux__) || defined (__ANDROID__)
/* Define _XOPEN_SOURCE to get IOV_MAX */
# if !defined (_XOPEN_SOURCE)
@@ -157,7 +157,7 @@ pragma Style_Checks ("M32766");
# include <_types.h>
#endif
-#ifdef __linux__
+#if defined (__linux__) || defined (__ANDROID__)
# include <pthread.h>
# include <signal.h>
#endif
@@ -1191,7 +1191,7 @@ CND(MSG_WAITALL, "Wait for full receptio
#endif
CND(MSG_NOSIGNAL, "No SIGPIPE on send")
-#ifdef __linux__
+#if defined (__linux__) || defined (__ANDROID__)
# define MSG_Forced_Flags "MSG_NOSIGNAL"
#else
# define MSG_Forced_Flags "0"
@@ -1356,7 +1356,7 @@ CND(SIZEOF_struct_hostent, "struct hoste
#define SIZEOF_struct_servent (sizeof (struct servent))
CND(SIZEOF_struct_servent, "struct servent")
-#if defined (__linux__)
+#if defined (__linux__) || defined (__ANDROID__)
#define SIZEOF_sigset (sizeof (sigset_t))
CND(SIZEOF_sigset, "sigset")
#endif
@@ -1456,7 +1456,8 @@ CND(CLOCK_THREAD_CPUTIME_ID, "Thread CPU
CNS(CLOCK_RT_Ada, "")
#endif
-#if defined (__APPLE__) || defined (__linux__) || defined (DUMMY)
+#if defined (__APPLE__) || defined (__linux__) || defined (__ANDROID__) \
+ || defined (DUMMY)
/*
-- Sizes of pthread data types
@@ -1499,7 +1500,7 @@ CND(PTHREAD_RWLOCKATTR_SIZE, "pthread_rw
CND(PTHREAD_RWLOCK_SIZE, "pthread_rwlock_t")
CND(PTHREAD_ONCE_SIZE, "pthread_once_t")
-#endif /* __APPLE__ || __linux__ */
+#endif /* __APPLE__ || __linux__ || __ANDROID__ */
/*
