From: Ciro Santilli <ciro.santilli@arm.com>
Date: Mon, 7 Oct 2019 10:47:19 +0000 (+0100)
Subject: sim-se: fix futexFunc TGT_FUTEX_WAIT always selects bitset
X-Git-Tag: v19.0.0.0~414
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35b95c78ef45841af7a683a7582062384829ece9;p=gem5.git

sim-se: fix futexFunc TGT_FUTEX_WAIT always selects bitset

Change-Id: I3e2bd1dd34d7cc00b2685547ab74b56bd8126128
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21605
Reviewed-by: Brandon Potter <Brandon.Potter@amd.com>
Maintainer: Brandon Potter <Brandon.Potter@amd.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 91ddb2567..66ca28f82 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2013, 2015 ARM Limited
+ * Copyright (c) 2012-2013, 2015, 2019 ARM Limited
  * Copyright (c) 2015 Advanced Micro Devices, Inc.
  * All rights reserved
  *
@@ -368,7 +368,7 @@ futexFunc(SyscallDesc *desc, int callnum, ThreadContext *tc)
         if (val != mem_val)
             return -OS::TGT_EWOULDBLOCK;
 
-        if (OS::TGT_FUTEX_WAIT) {
+        if (OS::TGT_FUTEX_WAIT == op) {
             futex_map.suspend(uaddr, process->tgid(), tc);
         } else {
             futex_map.suspend_bitset(uaddr, process->tgid(), tc, val3);