25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
--- open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h.orig 2015-04-30 20:27:54.197056616 -0700
|
|
+++ open-vm-tools-9.10.0-2476743/lib/include/vm_basic_asm_x86.h 2015-04-30 20:47:22.916480187 -0700
|
|
@@ -352,7 +352,9 @@
|
|
*-----------------------------------------------------------------------------
|
|
*/
|
|
|
|
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM)
|
|
+#if defined(__GNUC__) && \
|
|
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \
|
|
+ !defined(MUL64_NO_ASM)
|
|
|
|
static INLINE uint64
|
|
Mul64x3264(uint64 multiplicand, uint32 multiplier, uint32 shift)
|
|
@@ -457,7 +459,9 @@
|
|
*-----------------------------------------------------------------------------
|
|
*/
|
|
|
|
-#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 4) && !defined(MUL64_NO_ASM)
|
|
+#if defined(__GNUC__) && \
|
|
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && \
|
|
+ !defined(MUL64_NO_ASM)
|
|
|
|
static INLINE int64
|
|
Muls64x32s64(int64 multiplicand, uint32 multiplier, uint32 shift)
|