From 9fb6f406773f86e3640c0d012a61f9f972ba8147 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Mon, 17 Jun 2013 21:58:00 -0700
Subject: [PATCH] vpx_ports/x86.h: de-dup #elif block
Change-Id: I052647e13dd24354888c890f6b4a987d989552ae
---
vpx_ports/x86.h | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/vpx_ports/x86.h b/vpx_ports/x86.h
index a51cd2e01b..b009c3560b 100644
--- a/vpx_ports/x86.h
+++ b/vpx_ports/x86.h
@@ -186,36 +186,23 @@ x86_readtsc(void) {
#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
--
GitLab