Mesa (master): svga: Limit svga message capability to newer compilers

Brian Paul brianp at kemper.freedesktop.org
Wed May 24 21:34:14 UTC 2017


Module: Mesa
Branch: master
Commit: 14d16872298a88ddbf704ccdd5b0fc3b0e78778b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=14d16872298a88ddbf704ccdd5b0fc3b0e78778b

Author: Sinclair Yeh <syeh at vmware.com>
Date:   Thu Aug  4 12:57:06 2016 -0700

svga: Limit svga message capability to newer compilers

The assembly code used by the SVGA message feature doesn't
build properly with older compilers, so limit it to only
gcc 5.3.0 and newer.

Also modified the stubs to avoid "unused variable" warnings.

Reviewed-by: Charmaine Lee <charmainel at vmware.com>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/drivers/svga/svga_msg.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_msg.c b/src/gallium/drivers/svga/svga_msg.c
index 3bbe89f5f6..e3f72b628f 100755
--- a/src/gallium/drivers/svga/svga_msg.c
+++ b/src/gallium/drivers/svga/svga_msg.c
@@ -57,7 +57,7 @@
 #define HIGH_WORD(X) ((X & 0xFFFF0000) >> 16)
 
 
-#if defined(PIPE_CC_GCC)
+#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION > 502)
 
 /**
  * Hypervisor-specific bi-directional communication channel.  Should never
@@ -241,15 +241,25 @@ typedef uint32_t VMW_REG;
 
 #define VMW_PORT(cmd, in_bx, in_si, in_di, \
          port_num, magic,                  \
-         ax, bx, cx, dx, si, di)
+         ax, bx, cx, dx, si, di)           \
+         (void) in_bx;                     \
+         (void) ax; (void) bx; (void) cx;  \
+         (void) dx; (void) si; (void) di;
 
 #define VMW_PORT_HB_OUT(cmd, in_cx, in_si, in_di, \
          port_num, magic, bp,                     \
-         ax, bx, cx, dx, si, di)
+         ax, bx, cx, dx, si, di)                  \
+         (void) in_cx; (void) bp;                 \
+         (void) ax; (void) bx; (void) cx;         \
+         (void) dx; (void) si; (void) di;
+			
 
 #define VMW_PORT_HB_IN(cmd, in_cx, in_si, in_di,  \
          port_num, magic, bp,                     \
-         ax, bx, cx, dx, si, di)
+         ax, bx, cx, dx, si, di)                  \
+         (void) bp;                               \
+         (void) ax; (void) bx; (void) cx;         \
+         (void) dx; (void) si; (void) di;
 
 #endif /* #if PIPE_CC_GCC */
 




More information about the mesa-commit mailing list