From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 21A7ACD4F48 for ; Fri, 15 May 2026 14:16:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtFZ-0005Ka-Pn; Fri, 15 May 2026 10:10:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtFX-0005Jc-KU for qemu-arm@nongnu.org; Fri, 15 May 2026 10:10:47 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtFU-0003aE-AV for qemu-arm@nongnu.org; Fri, 15 May 2026 10:10:46 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-449d6c68ed8so8141257f8f.0 for ; Fri, 15 May 2026 07:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854243; x=1779459043; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ItINZxJcyXmGmwOm0WYPhb5KBATTrt6cbx40ypDwqrk=; b=r/zDXUwF/XJ3o3l/KYQn4FxddpGjzJETwSvVFIfx3uKfKNSvZTiF0mAX/I/XiaAi/F JA5fpQU4Oq9MR0dDihAlYEDwmHFgoEbocAhR8no0weAOcer1QECaT9zUo140xiKY4Dj0 TcFW6yuHSBj5cK2RSv+0fl9oZDkB0AP9KTL4acv8GHxn92caxDLz7zIwHJnAN6cvNQc6 sxLKbFkO+HRCwr8iSNy8NiOvxyHqXfl/Cuep5skqSlTkw1aRoWpL4RoBfnOWV/QlTlZ3 YrKvMiA8yChftLIT2EjMMLRhpwzYon9Yz7qTmTWYPuBG8KrgDsOCL4kVLZQTWemXFoAQ YDsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854243; x=1779459043; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ItINZxJcyXmGmwOm0WYPhb5KBATTrt6cbx40ypDwqrk=; b=Bm8XZISw5MKNPVDJ2usrwRnXCgT1ELeNn8M1kv2xu/tq79V59/xIoG82QmFBGqeDIo se6e73eIQIDwviYHhb5ZzH2ZKAGj7bt1UBNPTwOR4S7wMLyVkY5bAVm38CxZmEbcxKyK /L8jv3E1pLoe3AHWZLKGyS34qMsXBgiBAUPmOc7jvsQpaDARD5mn9S0A5I7AYYVK6nfZ zgzMY5AeA6XHFs1dP505H7DR3ikqPb2UVolU67y5cruDTNUbIV0HXryEncRf+dWqeXn6 mIs32DqpHNAWpZCMWJPRJ9InJ+yLJdQrU0ZhRaT/BfIMyeNQfiyLcFu2BD0XgkuXsuTC xSRA== X-Forwarded-Encrypted: i=1; AFNElJ9HGUIX5HCIcVKqMNhQgpQFp/AhM8ypRR1EIeij4rckzh5AqWKkTGgUzBAGoWsENkO9ig0YTEkbew==@nongnu.org X-Gm-Message-State: AOJu0Ywn0VyIdqi+APWYqDPLnBbU08LxduKQqG1v+4vIG7ilxe/cpz0A rwZhNLZy7WXTZvZt1O3KJGet+2pLZfj9Y3N6nOCO8w/4/JWWcwAfO7UVHK3D7vL4N4k= X-Gm-Gg: Acq92OE/ou7skxPIVye3pIN8PkjxmikFncL41AiNlBfPH9RbhI05rjlDIZZD/3uUe6j hBN4mTd549fOjFYLE0/4BoBLSeOUeKzL6iGMPUG9gfPO4K6wz10h7tVrvoXxOjrHHee6MWcLv30 BGiAPJUV8snU1/SESNm9C66tmEd0Y8p7Gb2ySsRQufiW8OsTjuC2eRS5wsHTIE4tb/HHw9e6Ouo Kgr7egZPvutGiWzBQU7XwimHnxK6CqSGb2u1DNpnoWoiuPfMVEapeVpjO7ZMcfEv3KNdMZBqbDY +LboBKf6apPGIKwO698UKLFZpljJE6EJ41ExNWIFhi0ZyKdDcG22wsAGo2ej3zpdVeFESZe++2S icy/5J9TevjISXyLX5Qu56QfFUlpCdKzMfdgjyiBdOkQ4wIb0UIsG+T2VkW+o7P8J43IJnEr59/ Wokt/f8QVVH8kYVtDGGCpeDGb4vHUQgQSSF0J8E7QkrKbjVojeF0FlRGRC3iwkimvE0d25NFmir NjpeEXH7NU= X-Received: by 2002:a05:6000:230d:b0:43c:ef4f:79dc with SMTP id ffacd0b85a97d-45e5c35e3b4mr5522658f8f.8.1778854242627; Fri, 15 May 2026 07:10:42 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45da15a562dsm15393181f8f.33.2026.05.15.07.10.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:10:41 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis , Mohamed Mediouni Subject: [PATCH v6 01/20] hw/arm: Build ARM/HVF GICv3 stub once Date: Fri, 15 May 2026 16:10:12 +0200 Message-ID: <20260515141032.3271-2-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Move arm_gicv3_hvf_stub.c, introduced in commit 48396ad6ce9 ("hw/intc: arm_gicv3_hvf: save/restore Apple GIC state"), to the global stub_ss[] source set which holds stub files being built once for all binaries, instead of one time per system binary. This prevents symbol clash when trying to build a single QEMU system binary: clang: error: linker command failed with exit code 1 (use -v to see invocation) duplicate symbol '_vmstate_gicv3_hvf' in: libqemu-aarch64-softmmu.a.p/hw_intc_arm_gicv3_hvf_stub.c.o libqemu-arm-softmmu.a.p/hw_intc_arm_gicv3_hvf_stub.c.o ld: 1 duplicate symbols Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Manos Pitsidianakis Reviewed-by: Mohamed Mediouni --- hw/intc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index d7db99ce354..fac2d228f9b 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -47,7 +47,7 @@ arm_common_ss.add(when: 'CONFIG_ARM_GICV3', if_true: files('arm_gicv3_cpuif.c')) specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_WHPX', 'TARGET_AARCH64'], if_true: files('arm_gicv3_whpx.c')) specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_true: files('arm_gicv3_hvf.c')) -specific_ss.add(when: ['CONFIG_HVF', 'CONFIG_ARM_GICV3'], if_false: files('arm_gicv3_hvf_stub.c')) +stub_ss.add(files('arm_gicv3_hvf_stub.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) arm_common_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) -- 2.53.0