From patchwork Fri Mar 27 18:13:09 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: 185010 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1609888ilr; Fri, 27 Mar 2020 11:15:06 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuJMvAbFb4/1m+pcHANuXGjtDh5QWPnAcNwVVb56eeaiI221/UcZ9/eYGarKqyH2O3ADxi0 X-Received: by 2002:a37:715:: with SMTP id 21mr599869qkh.435.1585332906573; Fri, 27 Mar 2020 11:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585332906; cv=none; d=google.com; s=arc-20160816; b=LJWpUz5omz2ADXUs/AlFCVP20WigZ1anqKmQpUeWtcTe5iT4KIi6roYapb6f+19t7n NVhCxukqkZSdYWBEcxV+/w+YeK1uGSVlVrGOfIwb7D/YyGS3keIOYWWJ7reoiWdFGXB1 7qKpncb37xZKsJ/Rm/rxT6NXt3NBwItxD4654dFyELG/oXoD7Ve3nTKZkkNXnA+sb0Re HRMGQjF3zZmU8/AuL6X9ECa6f/QmZohWE19SRvxsel+UZ+/1zksgL5Ko3PtYxzEbNs/5 tNuKZUx/7+We7YMhq1gWx0HdK8gV+ikKGQQs4fASAoxJVKwVbTwvbEmabwOFdNJJmg91 PMdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=mknqnLXNdO3bv9jIJ1lrUIcyeKoH8TMNeDvGSd6HYu8=; b=I2Px1pEMVno6l9gooNOm6cVVzokyXqUo11RIsqPm65ETGkvAOxvYjOVWjNB1r9wvCM iNMrbUF9ldedHFkeH/J4iDlpEp8yd+QMuPBFwYiuU4YjavDUeB8n0H7wcJZMMB2M1zsh wdh/2vh07pFL0XKex+lwmjxox3r3ho42mn43AswANFkU81G29RcqMQiSYgxkeOlqYY/O tIY5YSwV0V1aPDliTNKXFcpodkIRxCCzBibve7lASd9tTY2smTiC/LVDETPfTeMs98+D NS5GJLeakdDFUJEXLFWs0rVh9PPQ+KIZa+4KwCAwf87mbLcdPwhM1UfUvO/aYloOzE/q vwHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TcPB++bP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 184si3914779qkd.364.2020.03.27.11.15.06 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:15:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TcPB++bP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtVa-000520-0G for patch@linaro.org; Fri, 27 Mar 2020 14:15:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40439) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtTy-0001ip-9c for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtTx-0000ds-0v for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:26 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:44030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtTw-0000Yr-Lt for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:24 -0400 Received: by mail-wr1-x433.google.com with SMTP id m11so6663190wrx.10 for ; Fri, 27 Mar 2020 11:13:24 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=mknqnLXNdO3bv9jIJ1lrUIcyeKoH8TMNeDvGSd6HYu8=; b=TcPB++bPPZIvNvMS0exK3Uls0hzzw7XKDGUkqXGuYcIu0WifnP88RKYRT8dYyIVjd8 jhKqOD5Uj5LRTy2cwLfni+dzvTfaKk2zcLa1n/GN8j3ZkPzL8CRdmaPCPnbI+UKBsHrx YeyimjLRdtGcXUcy6iMlXk35OXJqAOyha/4quV2hzOnNRG1nuYmAUHfFVYnhTYTt1+UT Mnu4x+UVlr03hxxuhW4PL0s7IOMdFZ6zw346UlSsN4PdEJPpx7eFhkWUynArYOGR7DkB b3Go3GMsNu3zNUboYwvKRSmsfizbQREYmxL4rZH/5bJCLBfZ/imPjT6nSvO7VyY0Wha8 DoJA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=mknqnLXNdO3bv9jIJ1lrUIcyeKoH8TMNeDvGSd6HYu8=; b=s9b8Q8V1fJB8WbHPTh6MlctvZX/jCZiRDBEsdot7gMRO5ED4MKmw0u6BzIEMmwHKLw O0BvI3kwda98fo2DTJ3bMfRDL1L4THekvqWtg6+XCSZTHSO7PBuK5PTQjJyI3nhUfVJy rE94dAUA/WsVxgHQM5IrjXLyIvo6+zgiIJLJF5Lwxi5vuI11p0783ajTVpdxCIsaF1JV ZhLdsNKt2FibQFD3KkDxt7TnzgVQ2gbdthxcYDM6OHVyDQrxISIOfLOMighOi5ddjJe1 GlL/4zK+53hZhO2Keio25WtqmPZ0lRjOsvRZ6N58j1Co3w9Ysbn154+1Pir1D9NDtnDB r9eg== X-Gm-Message-State: ANhLgQ25kjmZxAikEBM00CqC+2EznntdRiTecLRgOCAGTDwYuFCg/sil NBfvvSzCxE6oeSncAQBrbQF4Kw== X-Received: by 2002:adf:9d8a:: with SMTP id p10mr663293wre.190.1585332802957; Fri, 27 Mar 2020 11:13:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z203sm9214902wmg.12.2020.03.27.11.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:21 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5B4011FF87; Fri, 27 Mar 2020 18:13:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 01/12] qemu/atomic.h: add #ifdef guards for stdatomic.h Date: Fri, 27 Mar 2020 18:13:09 +0000 Message-Id: <20200327181320.23329-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-1-alex.bennee@linaro.org> 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::433 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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.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 Message-Id: <20200326170121.13045-1-alex.bennee@linaro.org> Reviewed-by: Richard Henderson -- 2.20.1 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)