OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR bootstrap/60644 (Build of i686-pc-linux-android is broken)

Browse Source 
Fix for PR other/60644.
+2014-04-11  Barry Tannenbaum  <barry.m.tannenbaum@intel.com>
+
+       PR other/60644
+       * runtime/os-unix.c: Replaced all occurrances of ANDROID with
+       __ANDROID__.
+       * runtime/bug.h: Likewise.
+       * include/cilk/metaprogramming.h: Likewise.
+       * include/cilk/reducer_min_max.h: Likewise.
+

From-SVN: r209324
This commit is contained in:
Barry Tannenbaum 2014-04-11 19:56:42 +00:00 committed by Balaji V. Iyer
parent 4de3afd972
commit b1cd42c580
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcilkrts/ChangeLog
View File

@ -1,3 +1,12 @@
2014-04-11 Barry Tannenbaum <barry.m.tannenbaum@intel.com>
PR other/60644
* runtime/os-unix.c: Replaced all occurrances of ANDROID with
__ANDROID__.
* runtime/bug.h: Likewise.
* include/cilk/metaprogramming.h: Likewise.
* include/cilk/reducer_min_max.h: Likewise.
2014-03-26 Tobias Burnus <burnus@net-b.de> 2014-03-26 Tobias Burnus <burnus@net-b.de>
* libcilkrts.spec.in: New. * libcilkrts.spec.in: New.

2
libcilkrts/include/cilk/metaprogramming.h
View File

@ -468,7 +468,7 @@ inline void* allocate_aligned(std::size_t size, std::size_t alignment)
#ifdef _WIN32 #ifdef _WIN32
return _aligned_malloc(size, alignment); return _aligned_malloc(size, alignment);
#else #else
#if defined(ANDROID) || defined(__ANDROID__) #if defined(__ANDROID__)
return memalign(std::max(alignment, sizeof(void*)), size); return memalign(std::max(alignment, sizeof(void*)), size);
#else #else
void* ptr; void* ptr;

2
libcilkrts/include/cilk/reducer_min_max.h
View File

@ -3025,7 +3025,7 @@ struct legacy_reducer_downcast< reducer< op_min_index<Index, Type, Compare, Alig
#include <limits.h> #include <limits.h>
/* Wchar_t min/max constants */ /* Wchar_t min/max constants */
#if defined(_MSC_VER) || defined(ANDROID) #if defined(_MSC_VER) || defined(__ANDROID__)
# include <wchar.h> # include <wchar.h>
#else #else
# include <stdint.h> # include <stdint.h>

2
libcilkrts/runtime/bug.h
View File

@ -90,7 +90,7 @@ COMMON_PORTABLE extern const char *const __cilkrts_assertion_failed;
* GPL V3 licensed. * GPL V3 licensed.
*/ */
COMMON_PORTABLE void cilkbug_assert_no_uncaught_exception(void); COMMON_PORTABLE void cilkbug_assert_no_uncaught_exception(void);
#if defined(_WIN32) || defined(ANDROID) #if defined(_WIN32) || defined(__ANDROID__)
# define CILKBUG_ASSERT_NO_UNCAUGHT_EXCEPTION() # define CILKBUG_ASSERT_NO_UNCAUGHT_EXCEPTION()
#else #else
# define CILKBUG_ASSERT_NO_UNCAUGHT_EXCEPTION() \ # define CILKBUG_ASSERT_NO_UNCAUGHT_EXCEPTION() \

8
libcilkrts/runtime/os-unix.c
View File

@ -282,7 +282,7 @@ void __cilkrts_init_tls_variables(void)
} }
#endif #endif
#if defined (__linux__) && ! defined(ANDROID) #if defined (__linux__) && ! defined(__ANDROID__)
/* /*
* Get the thread id, rather than the pid. In the case of MIC offload, it's * Get the thread id, rather than the pid. In the case of MIC offload, it's
* possible that we have multiple threads entering Cilk, and each has a * possible that we have multiple threads entering Cilk, and each has a
@ -343,7 +343,7 @@ static int linux_get_affinity_count (int tid)
return available_procs; return available_procs;
#endif #endif
} }
#endif #endif // defined (__linux__) && ! defined(__ANDROID__)
/* /*
* __cilkrts_hardware_cpu_count * __cilkrts_hardware_cpu_count
@ -354,7 +354,7 @@ static int linux_get_affinity_count (int tid)
COMMON_SYSDEP int __cilkrts_hardware_cpu_count(void) COMMON_SYSDEP int __cilkrts_hardware_cpu_count(void)
{ {
#if defined ANDROID || (defined(__sun__) && defined(__svr4__)) #if defined __ANDROID__ || (defined(__sun__) && defined(__svr4__))
return sysconf (_SC_NPROCESSORS_ONLN); return sysconf (_SC_NPROCESSORS_ONLN);
#elif defined __MIC__ #elif defined __MIC__
/// HACK: Usually, the 3rd and 4th hyperthreads are not beneficial /// HACK: Usually, the 3rd and 4th hyperthreads are not beneficial
@ -409,7 +409,7 @@ COMMON_SYSDEP void __cilkrts_yield(void)
// giving up the processor and latency starting up when work becomes // giving up the processor and latency starting up when work becomes
// available // available
_mm_delay_32(1024); _mm_delay_32(1024);
#elif defined(ANDROID) || (defined(__sun__) && defined(__svr4__)) #elif defined(__ANDROID__) || (defined(__sun__) && defined(__svr4__))
// On Android and Solaris, call sched_yield to yield quantum. I'm not // On Android and Solaris, call sched_yield to yield quantum. I'm not
// sure why we don't do this on Linux also. // sure why we don't do this on Linux also.
sched_yield(); sched_yield();