From: Wang He <xw897002528@gmail.com>
Date: Tue, 10 May 2016 05:40:30 +0000 (+0800)
Subject: st/nine: Minor change to support musl libc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f21b7d1e5c21b749ae7c19d3dc80dc4e14e4bb77;p=mesa.git

st/nine: Minor change to support musl libc

A few changes to support musl libc as well.

In particular fpu_control.h is glibc specific.
fenv.h doesn't enable to do exactly what we want either,
so instead use assembly directly.

Signed-off-by: Wang He <xw897002528@gmail.com>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
---

diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index b29e161869c..20a0ce064f5 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -57,20 +57,19 @@
 
 #if defined(PIPE_CC_GCC) && (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64))
 
-#include <fpu_control.h>
-
 static void nine_setup_fpu()
 {
-    fpu_control_t c;
+    uint16_t c;
+
+    __asm__ __volatile__ ("fnstcw %0" : "=m" (*&c));
 
-    _FPU_GETCW(c);
     /* clear the control word */
-    c &= _FPU_RESERVED;
+    c &= 0xF0C0;
     /* d3d9 doc/wine tests: mask all exceptions, use single-precision
      * and round to nearest */
-    c |= _FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM | _FPU_MASK_OM |
-         _FPU_MASK_UM | _FPU_MASK_PM | _FPU_SINGLE | _FPU_RC_NEAREST;
-    _FPU_SETCW(c);
+    c |= 0x003F;
+
+    __asm__ __volatile__ ("fldcw %0" : : "m" (*&c));
 }
 
 #else
diff --git a/src/gallium/state_trackers/nine/threadpool.h b/src/gallium/state_trackers/nine/threadpool.h
index 2562c96f256..6f8f8c455d0 100644
--- a/src/gallium/state_trackers/nine/threadpool.h
+++ b/src/gallium/state_trackers/nine/threadpool.h
@@ -24,6 +24,8 @@
 #ifndef _THREADPOOL_H_
 #define _THREADPOOL_H_
 
+#include <pthread.h>
+
 struct NineSwapChain9;
 
 #define MAXTHREADS 1