Is it ok to port this patch to 4.9 branch: commit 15bee5d49b1c746fd3e784432d7e4988941a671e Author: bviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4> Date: Fri Apr 11 19:56:42 2014 +0000
Fix for PR other/60644. +2014-04-11 Barry Tannenbaum <barry.m.tannenb...@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. + git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209324 138bc75d-0d04-0410-961f-82ee72b054a4 to fix http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60644 and cure i686-pc-linux-android build? thanks, Alexander 2014-04-17 14:25 GMT+04:00 Paweł Sikora <pl...@agmk.net>: > W dniu 2014-04-17 12:13, Jonathan Wakely napisał(a): > >> On 17 April 2014 10:38, Paweł Sikora wrote: >>> >>> Hi, >>> >>> the opt_random.h header includes <x86intrin.h> unconditionally and breaks >>> crytopp build >>> (redefinition of _mm_shuffle_epi8 in cpu.h). >>> could you please add #ifdef __SSSE3__ around this include? >> >> >> Do you mean __SSE3__ not __SSSE3__? > > > yes, __SSE3__. > > >> That's the macro that controls whether the >> config/cpu/i486/opt/bits/opt_random.h header actually uses the >> intrinsics or not: >> >> namespace std _GLIBCXX_VISIBILITY(default) >> { >> _GLIBCXX_BEGIN_NAMESPACE_VERSION >> >> #ifdef __SSE3__ >> template<> >> template<typename _UniformRandomNumberGenerator> >> void >> normal_distribution<double>:: > >