diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | vmmon.patch | 31 |
3 files changed, 35 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = vmware-workstation pkgdesc = The industry standard for running multiple operating systems as virtual machines on a single Linux PC. pkgver = 14.1.1 - pkgrel = 3 + pkgrel = 4 url = https://www.vmware.com/products/workstation-for-linux.html install = vmware-workstation.install arch = x86_64 @@ -78,7 +78,7 @@ pkgbase = vmware-workstation sha256sums = d7a9fbf39a0345ae2f14f7f389f30b1110f605d187e0c241e99bbb18993c250d sha256sums = 05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487 sha256sums = 6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d - sha256sums = 368b14c99a340b39f11af7534faa59da53837c3572c7f4e90544bc9434ec5029 + sha256sums = 9f93fa48c658474080482f2714c30bf0a850f40c2d7c739473dc9c489ce3da7b sha256sums = c2e981d5d6a4fab4d33d4e3df394bdb597834fae14ebb535a40271c3f2677f0d sha256sums = 0cdf4279a48ea915c796c0a230a3483dc9095bbd00fe4287889f0403ead93165 sha256sums = 9365045b6116f76bcc46436ad73439ee89893c7c5187cf9f3869c12bc2444b0a @@ -17,7 +17,7 @@ pkgname=vmware-workstation pkgver=14.1.1 _buildver=7528167 _pkgver=${pkgver}_${_buildver} -pkgrel=3 +pkgrel=4 pkgdesc='The industry standard for running multiple operating systems as virtual machines on a single Linux PC.' arch=(x86_64) url='https://www.vmware.com/products/workstation-for-linux.html' @@ -112,7 +112,7 @@ sha256sums=( '05e26d8b21d190ebabb7f693998114d9d5991d9dfb71acb4d990293a65b6b487' '6ce902b1dab8fc69be253abd8e79017011985eca850ff7acc7282f9ab668e35d' - '368b14c99a340b39f11af7534faa59da53837c3572c7f4e90544bc9434ec5029' + '9f93fa48c658474080482f2714c30bf0a850f40c2d7c739473dc9c489ce3da7b' 'c2e981d5d6a4fab4d33d4e3df394bdb597834fae14ebb535a40271c3f2677f0d' ) options=(!strip emptydirs) diff --git a/vmmon.patch b/vmmon.patch index d69f3135cb1b..2aff1e3a7347 100644 --- a/vmmon.patch +++ b/vmmon.patch @@ -14,3 +14,34 @@ index de8162e..6124a71 100644 # Header directory for the running kernel ifdef LINUXINCLUDE +From: Michal Kubecek <mkubecek@suse.cz> +Date: Mon, 26 Mar 2018 13:33:32 +0200 +Subject: [PATCH] vmmon: fix indirect call with retpoline build +diff --git a/vmmon/common/task.c b/vmmon/common/task.c +index 98cc74a..400ebfe 100644 +--- a/vmmon/common/task.c ++++ b/vmmon/common/task.c +@@ -2203,12 +2203,23 @@ TaskSwitchToMonitor(VMCrossPage *crosspage) + { + uint64 raxGetsWiped, rcxGetsWiped; + ++#ifdef CALL_NOSPEC ++ __asm__ __volatile__(CALL_NOSPEC ++ : "=a" (raxGetsWiped), ++ "=c" (rcxGetsWiped) ++ : "0" (codePtr), ++ "1" (crosspage), ++ THUNK_TARGET(codePtr) ++ : "rdx", "r8", "r9", "r10", "r11", "cc", "memory"); ++#else + __asm__ __volatile__("call *%%rax" + : "=a" (raxGetsWiped), + "=c" (rcxGetsWiped) + : "0" (codePtr), + "1" (crosspage) + : "rdx", "r8", "r9", "r10", "r11", "cc", "memory"); ++#endif ++ + } + #elif defined(_MSC_VER) + /* |