From: VMware, Inc <>
Date: Mon, 20 Dec 2010 21:58:46 +0000 (-0800)
Subject: Clean up leftover references to VM_ASM_PLUS.
X-Git-Tag: 2010.12.19-339835~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ecbfdba28178213bb26c36cf53b7dd1b888d335;p=thirdparty%2Fopen-vm-tools.git

Clean up leftover references to VM_ASM_PLUS.

VM_ASM_PLUS was removed because it's always true now. This
change gets rid of a few leftover references in the 64-bit
code that were generating compiler warnings.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/include/vm_basic_asm.h b/open-vm-tools/lib/include/vm_basic_asm.h
index 93cba796c..2f257375c 100644
--- a/open-vm-tools/lib/include/vm_basic_asm.h
+++ b/open-vm-tools/lib/include/vm_basic_asm.h
@@ -875,14 +875,8 @@ SetBit64(uint64 *var, unsigned index)
 #ifdef __GNUC__
    __asm__ (
       "bts %1, %0"
-#   if VM_ASM_PLUS
       : "+mr" (*var)
       : "ri" (index)
-#   else
-      : "=mr" (*var)
-      : "ri" (index),
-        "0" (*var)
-#   endif
       : "cc"
    );
 #elif defined _MSC_VER
@@ -896,14 +890,8 @@ ClearBit64(uint64 *var, unsigned index)
 #ifdef __GNUC__
    __asm__ (
       "btr %1, %0"
-#   if VM_ASM_PLUS
       : "+mr" (*var)
       : "ri" (index)
-#   else
-      : "=mr" (*var)
-      : "ri" (index),
-        "0" (*var)
-#   endif
       : "cc"
    );
 #elif defined _MSC_VER