From patchwork Mon Dec 20 11:34:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Li=C5=A1ka?= X-Patchwork-Id: 1570988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=suse.cz header.i=@suse.cz header.a=rsa-sha256 header.s=susede2_rsa header.b=RvOYJLhr; dkim=pass header.d=suse.cz header.i=@suse.cz header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=ub9fHaXu; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JHcvw5Mvjz9s1l for ; Mon, 20 Dec 2021 22:35:24 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 82D7D3857805 for ; Mon, 20 Dec 2021 11:35:22 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 2286E3857C66 for ; Mon, 20 Dec 2021 11:34:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 2286E3857C66 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4AF9321109 for ; Mon, 20 Dec 2021 11:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1640000098; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPHHj7hYJR3JJRRsh5EfIVHkQtTNu9dbrov6JsZVKdM=; b=RvOYJLhrxAi4rk0El1G3WrRsFvFqNdQa2kpEhXHqfK0uKX43tMEfNc+NyppoghG9oelxdY DvON1Vihd4lMaf/n6aZz65LCMgz6tuAqXWg1VeFAX/ktGhsJDtubMC/hcyqSNXaDkD95dI lvj4qeuCCt8Y7+5ZxREtUsouPzoEfms= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1640000098; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPHHj7hYJR3JJRRsh5EfIVHkQtTNu9dbrov6JsZVKdM=; b=ub9fHaXuFt6qDMvZbk3qqT0AjRy7BqstqtdL3wwBLk9ycb2hViV9++cHAfmzLLf1U1pAv/ PYrAzCYtXk7gqXAQ== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 273B513B83 for ; Mon, 20 Dec 2021 11:34:58 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qq5fB2JqwGEUSQAAMHmgww (envelope-from ) for ; Mon, 20 Dec 2021 11:34:58 +0000 Message-ID: <2ce2722c-d5b5-07b3-01a2-0d32d36b7905@suse.cz> Date: Mon, 20 Dec 2021 12:34:57 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 From: =?utf-8?q?Martin_Li=C5=A1ka?= Subject: [PATCH][pushed] jit: Fix -Wodr warning To: gcc-patches@gcc.gnu.org Content-Language: en-US X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Pushed as obvious. Martin gcc/jit/libgccjit.c:3957:8: warning: type 'struct version_info' violates the C++ One Definition Rule [-Wodr] ../../gcc/jit/libgccjit.c:3957:8: warning: type 'struct version_info' violates the C++ One Definition Rule [-Wodr] 3957 | struct version_info ../../gcc/tree-ssa-loop-ivopts.c:181: note: a different type is defined in another translation unit 181 | struct version_info gcc/jit/ChangeLog: * libgccjit.c (struct version_info): Rename to jit_version_info. (struct jit_version_info): Likewise. (gcc_jit_version_major): Likewise. (gcc_jit_version_minor): Likewise. (gcc_jit_version_patchlevel): Likewise. --- gcc/jit/libgccjit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c index 5cb27a20d41..3d2d838dc4d 100644 --- a/gcc/jit/libgccjit.c +++ b/gcc/jit/libgccjit.c @@ -3954,11 +3954,11 @@ gcc_jit_context_new_rvalue_from_vector (gcc_jit_context *ctxt, static pthread_mutex_t version_mutex = PTHREAD_MUTEX_INITIALIZER; -struct version_info +struct jit_version_info { /* Default constructor. Populate via parse_basever, guarded by version_mutex. */ - version_info () + jit_version_info () { pthread_mutex_lock (&version_mutex); parse_basever (&major, &minor, &patchlevel); @@ -3974,21 +3974,21 @@ struct version_info extern int gcc_jit_version_major (void) { - version_info vi; + jit_version_info vi; return vi.major; } extern int gcc_jit_version_minor (void) { - version_info vi; + jit_version_info vi; return vi.minor; } extern int gcc_jit_version_patchlevel (void) { - version_info vi; + jit_version_info vi; return vi.patchlevel; }