rpms/open-vm-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix (asm_x86.patch) for correct GCC version check

Browse Source
This commit is contained in:
Ravindra Kumar 2015-04-30 21:36:57 -07:00
parent c5619c1d06
commit 8df2fd7cf7
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm_x86.patch Normal file
View File

@ -0,0 +1,24 @@
--- 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)

11
open-vm-tools.spec
View File

@ -36,8 +36,9 @@ URL: http://%{name}.sourceforge.net/
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/stable-%{majorversion}.x/%{name}-%{version}-%{toolsbuild}.tar.gz
Source1: %{toolsdaemon}.service
Source2: %{vgauthdaemon}.service
Patch0: strerror_r.patch
Patch1: toolboxcmd.patch
Patch0: asm_x86.patch
Patch1: strerror_r.patch
Patch2: toolboxcmd.patch
%if 0%{?rhel} >= 7
ExclusiveArch: x86_64
%else
@ -109,8 +110,9 @@ VMware virtual machines.
%prep
%setup -q -n %{name}-%{version}-%{toolsbuild}
%patch0 -p1 -b .strerror_r
%patch1 -p1 -b .toolboxcmd
%patch0 -p1 -b .asm_x86
%patch1 -p1 -b .strerror_r
%patch2 -p1 -b .toolboxcmd
%build
# Use _DEFAULT_SOURCE to suppress warning until upstream
@ -252,6 +254,7 @@ fi
- Package new upstream version open-vm-tools-9.10.0-2476743
- New version requires adding a new service vgauthd
- Removed old patches that are no longer needed
- Fix (asm_x86.patch) for correct GCC version check
- Fix (strerror_r.patch) for picking GNU signature of strerror_r
- Fix (toolboxcmd.patch) for compiling toolboxcmd-shrink.c with gcc 5.0.1