libvpx: Pull from upstream

source/libvpx/vpx_ports/x86.h

Index: source/libvpx/vpx_ports/x86.h
===================================================================
--- source/libvpx/vpx_ports/x86.h	(revision 207064)
+++ source/libvpx/vpx_ports/x86.h	(working copy)
@@ -186,36 +186,23 @@
 #if defined(__GNUC__) && __GNUC__
 static void
 x87_set_control_word(unsigned short mode) {
-  __asm__ __volatile__("fldcw %0" : : "m"( *&mode));
+  __asm__ __volatile__("fldcw %0" : : "m"(*&mode));
 }
 static unsigned short
 x87_get_control_word(void) {
   unsigned short mode;
-  __asm__ __volatile__("fstcw %0\n\t":"=m"( *&mode):);
+  __asm__ __volatile__("fstcw %0\n\t":"=m"(*&mode):);
     return mode;
 }
 #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 static void
-x87_set_control_word(unsigned short mode)
-{
-    asm volatile("fldcw %0" : : "m"(*&mode));
-}
-static unsigned short
-x87_get_control_word(void)
-{
-    unsigned short mode;
-    asm volatile("fstcw %0\n\t":"=m"(*&mode):);
-  return mode;
-}
-#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-static void
 x87_set_control_word(unsigned short mode) {
-  asm volatile("fldcw %0" : : "m"( *&mode));
+  asm volatile("fldcw %0" : : "m"(*&mode));
 }
 static unsigned short
 x87_get_control_word(void) {
   unsigned short mode;
-  asm volatile("fstcw %0\n\t":"=m"( *&mode):);
+  asm volatile("fstcw %0\n\t":"=m"(*&mode):);
   return mode;
 }
 #elif ARCH_X86_64