diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-11-13 16:31:13 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2015-11-13 16:37:29 +0100 |
| commit | 2af4da0ea9ee0b029e89cf5ab65d378d426d1af1 (patch) | |
| tree | a9ccdfb1a2620566ddca932ce7135d18934496ca /tools | |
| parent | 81860b908b0c6104d47886a172b65d8d31f59ec3 (diff) | |
improve compile time SSE2 detection, fix broken android build
Prereq. to enable runtime SSE2 detection is that the compiler
supports it in the first place. MSVS and GCC use different
compiler flags for this so use __LO_SSE2_AVAILABLE__ to make this
build platform independent.
emmintrin.h is unavailable on ARM Android so include this and
compile the SSE2 specific code only when we are sure we can build
SSE2 code (__LO_SSE2_AVAILABLE__ is defined).
Change-Id: I212c4e0b99a314d087b9def822a81325b25f3469
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/source/misc/cpuid.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/source/misc/cpuid.cxx b/tools/source/misc/cpuid.cxx index b4406befb0e8..5e052fbbc166 100644 --- a/tools/source/misc/cpuid.cxx +++ b/tools/source/misc/cpuid.cxx @@ -16,8 +16,7 @@ namespace tools namespace cpuid { -// First minimize to MSVC / GCC compat. compiler and x86 / x64 architecture -#if (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))) || (defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))) +#if defined(__LO_SSE2_AVAILABLE__) namespace { |