From 4fbb4b9c12d1944e5d60bc4f3d0cbd0bf7bed36d Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Thu, 12 Oct 2017 10:33:37 +0200 Subject: lib: Fix compilation on non-x86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The meson build avoids the failure by excluding the igt_x86.c file from the compilation. autotools being what they are don't support that in an easy way, so just use the preprocessor to avoid the duplicate function definitions. Since igt_x86.c will now be ignored for non-x86 builds, the meson work- around can be removed. Reviewed-by: Ville Syrjälä Signed-off-by: Thierry Reding --- lib/igt_x86.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/igt_x86.h') diff --git a/lib/igt_x86.h b/lib/igt_x86.h index d6dcfa10..27b7f0fd 100644 --- a/lib/igt_x86.h +++ b/lib/igt_x86.h @@ -40,7 +40,7 @@ #define AVX 0x80 #define AVX2 0x100 -#if defined(__x86_64__) +#if defined(__x86_64__) || defined(__i386__) unsigned igt_x86_features(void); char *igt_x86_features_to_string(unsigned features, char *line); #else -- cgit v1.2.3