From nobody Fri Nov 14 05:12:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1585242158; cv=none; d=zohomail.com; s=zohoarc; b=lTBZl9x4r2Eb9sQ6l2cOSsCBYDuCOuGJnrPUh8xWzSwRLhTkXeiJQ5qB0dCXWX6ptIZ3iys0AyWdDMTbUAIBX0UdFJyiJ/Prq1yJitwCA8Al/ZhNKSWmN4HFZVRcbde4kZQuKCKBw5hblEG3nHLNM98ajWMeiztAjHkdkcv7kEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585242158; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=dqLqRQ4b0SR5ODbR+9qMmow31WjM5Vry9omXjfMMazw=; b=X9OB39Z76mwC/bHu1H13OvF8KypaE6T585gM4oOa8vG05LJLZo5Q/fcvVOlwAGT94vQFKLWrdPyWP3bNIX1pHfTdY4mB1LlH8bDDCr97LMxoeqoCMO2uWunN9NHAw/BG8dZ0cZG0AsDygq4o0skUjK0IrFrpxCSCbHtr1RyaqZ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585242158095417.0990179930958; Thu, 26 Mar 2020 10:02:38 -0700 (PDT) Received: from localhost ([::1]:56722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHVtr-0007n6-Q5 for importer@patchew.org; Thu, 26 Mar 2020 13:02:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37796) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHVsx-0007MY-PU for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:01:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHVsw-0004lj-Cf for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:01:39 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHVsv-0004eB-BB for qemu-devel@nongnu.org; Thu, 26 Mar 2020 13:01:38 -0400 Received: by mail-wr1-x443.google.com with SMTP id h15so8704274wrx.9 for ; Thu, 26 Mar 2020 10:01:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a1sm4717549wro.72.2020.03.26.10.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 10:01:33 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1DE0F1FF7E; Thu, 26 Mar 2020 17:01:33 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dqLqRQ4b0SR5ODbR+9qMmow31WjM5Vry9omXjfMMazw=; b=ecBrk1q5TSqvNxbmz8psUz04AafImfd9hjKQ+yggV3bDIUpHcrkXFGTBhbDCYPeGYO LvxGR4TKSg0MO/qG1RnVbj3+1E0MCjuUXsxo7QO4fnYp2nClkmr3LO0N1+5F0bep6pIY 2sXw+Gp+Yy7Wgkv4Y6defQAc2VIgIcHlMUU5egtVWzgEgxA/KQVMb3bkv4uzi/X8p2B3 NWRwPUBY2OBUGF6O2rTl0Qukm4sKiLHbLQdl9Ryxe/Jq0HbnkMLqn6tf6d3cJ5od8EW4 VyMBlS/0sQhXptON53hvkkD5vU0pLItFKrpvx9N4NrT+/3GeQpWpOvVJyvA4J2c9dSqv aL2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=dqLqRQ4b0SR5ODbR+9qMmow31WjM5Vry9omXjfMMazw=; b=F6xMCVTtBgfjvW2vmF9ktUfgZGKc7YMRyTZf/LVTGBE7nblt6/Y3tXjeKEwvYwBFht GTLGM8dePMsYfIw5DZgp4r3FO8dkDhXyCg6GHsmr3wljebbGYyhM8uei0mkq0tG6OYNx 0GecQ+q0ETK1lUvzyeic+KRQuWlcn54VbDCHJO5bmgjPmrhD+C52OCc32ObVqBEsa7g9 s3Pt+rDSZVEr7/X95GfGlzOE8+dWepVhmYOl91KRByCk2IQiv76lK+eFh9JClURW39x5 CirR+ERhvsGxjUbxWzoFlEUXnS8d1nGBGk9u/SYat20IgXuDWGgeqf/uFjFzP9quqwOo O3eA== X-Gm-Message-State: ANhLgQ0+korkY2ouiaiKxTKnmPKgPSFGvwfnRvWoGIWjMgg+tCuKxWy4 inz7FPpr8JhpQLlnRRxVib78Yg== X-Google-Smtp-Source: ADFU+vtXAMgmXxPKKcRWXG6PtSOphvHTiW6L0wPQuigWeLWyU/1rjIjRh6i2Q+3EGPLu0haUKCVvsg== X-Received: by 2002:a5d:6a43:: with SMTP id t3mr9940802wrw.87.1585242095139; Thu, 26 Mar 2020 10:01:35 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH] qemu/atomic.h: add #ifdef guards for stdatomic.h Date: Thu, 26 Mar 2020 17:01:21 +0000 Message-Id: <20200326170121.13045-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Deep inside the FreeBSD netmap headers we end up including stdatomic.h which clashes with qemu's atomic functions which are modelled along the C11 standard. To avoid a massive rename lets just ifdef around the problem. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson --- include/qemu/atomic.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h index f9cd24c8994..ff72db51154 100644 --- a/include/qemu/atomic.h +++ b/include/qemu/atomic.h @@ -208,11 +208,14 @@ /* Provide shorter names for GCC atomic builtins, return old value */ #define atomic_fetch_inc(ptr) __atomic_fetch_add(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_fetch_dec(ptr) __atomic_fetch_sub(ptr, 1, __ATOMIC_SEQ_CST) + +#ifndef atomic_fetch_add #define atomic_fetch_add(ptr, n) __atomic_fetch_add(ptr, n, __ATOMIC_SEQ_C= ST) #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_C= ST) #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_C= ST) #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CS= T) #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_C= ST) +#endif =20 #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_C= ST) #define atomic_dec_fetch(ptr) __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_C= ST) @@ -392,11 +395,14 @@ /* Provide shorter names for GCC atomic builtins. */ #define atomic_fetch_inc(ptr) __sync_fetch_and_add(ptr, 1) #define atomic_fetch_dec(ptr) __sync_fetch_and_add(ptr, -1) + +#ifndef atomic_fetch_add #define atomic_fetch_add(ptr, n) __sync_fetch_and_add(ptr, n) #define atomic_fetch_sub(ptr, n) __sync_fetch_and_sub(ptr, n) #define atomic_fetch_and(ptr, n) __sync_fetch_and_and(ptr, n) #define atomic_fetch_or(ptr, n) __sync_fetch_and_or(ptr, n) #define atomic_fetch_xor(ptr, n) __sync_fetch_and_xor(ptr, n) +#endif =20 #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1) --=20 2.20.1