From patchwork Thu Mar 26 17:01:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1262162 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=ecBrk1q5; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48pB9S2FZ0z9sSG for ; Fri, 27 Mar 2020 04:02:03 +1100 (AEDT) Received: from localhost ([::1]:56708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHVtI-0007Mj-OQ for incoming@patchwork.ozlabs.org; Thu, 26 Mar 2020 13:02:00 -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) 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) 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) From: =?utf-8?q?Alex_Benn=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 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_Benn=C3=A9e?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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ée 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_CST) #define atomic_fetch_sub(ptr, n) __atomic_fetch_sub(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_and(ptr, n) __atomic_fetch_and(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_or(ptr, n) __atomic_fetch_or(ptr, n, __ATOMIC_SEQ_CST) #define atomic_fetch_xor(ptr, n) __atomic_fetch_xor(ptr, n, __ATOMIC_SEQ_CST) +#endif #define atomic_inc_fetch(ptr) __atomic_add_fetch(ptr, 1, __ATOMIC_SEQ_CST) #define atomic_dec_fetch(ptr) __atomic_sub_fetch(ptr, 1, __ATOMIC_SEQ_CST) @@ -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 #define atomic_inc_fetch(ptr) __sync_add_and_fetch(ptr, 1) #define atomic_dec_fetch(ptr) __sync_add_and_fetch(ptr, -1)