From patchwork Wed Mar 5 00:52:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 870502 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:178f:b0:38f:210b:807b with SMTP id e15csp541123wrg; Tue, 4 Mar 2025 16:54:49 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX4x5iec62Hgxe3L56c6AZw4tvdz/TSP+Y79f3Weolyl4ARPISfeWGm8xm8j5rMdri/RtR3+g==@linaro.org X-Google-Smtp-Source: AGHT+IGfRR9gKz0FP2XRPFtCh9SMGFOsrFe/sEzxN4x6Fe69HzpVClO7N4zFgAfVuJj4ay9EMd9b X-Received: by 2002:a05:620a:268b:b0:7c0:a594:d788 with SMTP id af79cd13be357-7c3d8ef46a2mr174283585a.39.1741136089755; Tue, 04 Mar 2025 16:54:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741136089; cv=none; d=google.com; s=arc-20240605; b=ls38euKwbnnBOFOjrVANQLWDcXhDLuhkMpVwJ0KorFCkLXxciNJvHm5oT9F2f1lOn4 BmdQijjyx6EUJ8e9T4VugDKrN+v9w2ZcAtwnoAzQ4SvTtbNLVyaidB3xt/MDbagH/w8y oXW3bfLikkCyZlTSbwXFcUaz9CretBcm0HxvhpB2bzia1UHhmw/XNMbTYLm2K4phJ/ik OFUh2u5WUhdbJqxJmPmu360vYwBXy4RY71f9Hqx1LGsWudoVrrWIWLmvcpo6+su51tZR GdOsIOIfS9UNxVsD7iZPF9/E4EDcRPI5Ku7QxYJSHrlDy0HeJAnhjbBqsmkwJuVFMfw8 QkOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=SzOKHZRFCe8gSsyMmCbgGLcMBcX5RnVMQQNugexIWns=; fh=BW2TZvblXUTHno32gRgjkSOAINcocKVvD//AVk+YV+0=; b=XdCELj89aWK+ZcG4bmGWb1JO/fBqJZFpmSnVZAyqWpEchzCNIxbLMJh2zGr0C//65h IG/gDvphk2PaXq2mTHUJ5pJIqYbPbb9+2Ar4rZyTPsB/nEEpoK8QXLsbdUwKirJpq+e7 6RIU+aMvZVj2ot6B+yRYQmPeFYzR8bKBD8Je72jAKGJDgbgllAL9/d98SHLT/qIS2J17 Gc4wKhicEUcGa4OMzQrSM+UYANktg7OhtuRS14fdWCkubrHIq4g7EG2Szs/nDU3CyXqQ e5UFrhh4pMhP5rkImFMgrrjcMAKFenguEYGRoEhp6eYFSSsigrtb2SoT58GvrwI75Ksp ry+Q==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZV+JpKfZ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c3d6560c77si129344285a.284.2025.03.04.16.54.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Mar 2025 16:54:49 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=ZV+JpKfZ; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tpd1R-00035V-2l; Tue, 04 Mar 2025 19:54:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tpd0u-0002UD-5x for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:36 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tpd0q-0007YW-Kw for qemu-devel@nongnu.org; Tue, 04 Mar 2025 19:53:30 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-38a8b17d7a7so3682142f8f.2 for ; Tue, 04 Mar 2025 16:53:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1741136007; x=1741740807; 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=SzOKHZRFCe8gSsyMmCbgGLcMBcX5RnVMQQNugexIWns=; b=ZV+JpKfZ0Jw5FRV4T4jbnSvF6MZMn7S97k3SUVkqmCzEE8LA2gbyVAlM1xWbSYr1Oh 5hufbHB6NI/1jlAIU2NLc+t/EkFadGMmPNzuZdrDWlRNu2Om7AHbRIORFEKo7awPd/1k YiN4cZvriWcNSUAH6Ez3F6gD03UIwR7HAxaFPW/Hs3lu0h/vZVMdrnCgzHvY3xlVtUNV JKwEpqvXgCKD2deolia1v7MUUFJkupdmTfWt+XF7WWwnN0aNE9OLOZsRcu4/XGDJy1az wqIC0581qPdwpo+MSyiVhcICayzvPqbm8FrO/5xsIzNxrs8Mu7MnEjfjHIYXl4lzGae0 0jsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741136007; x=1741740807; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SzOKHZRFCe8gSsyMmCbgGLcMBcX5RnVMQQNugexIWns=; b=kGBJHJOfKpX5LoBXh8Z4uUay36pWw68jsx++mBvRdBcfRq93cEuNo8XFF58UJawBp/ 667bo7y9fVQuHmWXIXiRcvpsEVSRip8EkPMqCarQS0k0MiMkGD1DWR6OcSIDE73JFFRT X8uvYZdu/CNU/wDo/RSGlGjM3gB8dbJsWkIMpsdE060LC0rjKNNU/jSi5JAH/iu+NfQ3 PrM+zlvEbU9HZTGcsR2E8EHdtRqyZLQQpd6/xHBV5+3L78F1CLa0JubckoZJLdp99NCy 3HuVHEEAmy0g0zsZZpc23aKwCHDsiaAYrUjxcKO5ghy85c658/sWRGUbt4CWUxdcG7Uz 4CIA== X-Gm-Message-State: AOJu0Ywqn7rDfFEkA6+CxHOnpatGHW8Sv49sHGg8iApEIq6AqI+7VrI4 3fRG0cXQwss9p5COhcGUkIRpA8TcJl8aZT3/LFYbKHMl2IpBuMus7kqH5d84/Rw5VAjR+X2n0BW l5d4= X-Gm-Gg: ASbGncsHtA837A5/vD//IPpSsBs2wO2lCyGoEWy51cgzXa6iWjJeSq1Q8tVp11oBR8W gIvwOA+ixs6FaWWm3IjrdeaG4TbMswEPalfXYvVtTW+1nNtXZQNBr9lxf2SyaevJXPbVfR1Rs8v nGqj3wfT1r8sywf/n4l5wkzB8QZd2mA1jxKGZTX2eapt8c3Xo/zaBfyy2r2IZMuVOoY9F2bZtJK RSDEIiAjkcE6PBlJV4DVWpOfKAcEz6OkMu6z3lJfekf+qfy54GyUdFO1Aa1JX521xvKlUnIo5Mc FXS1SPvwp/y9qk4uLFLSPJ05UVGOBuP/hLwrK3mtLnQAuZkw7o9BlBeySv/egOQblKgSITcuGPB D30OUreaxQnGlUJTLgQo= X-Received: by 2002:a05:6000:184c:b0:391:2163:dd67 with SMTP id ffacd0b85a97d-3912163dfe0mr147689f8f.6.1741136006937; Tue, 04 Mar 2025 16:53:26 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390e4847fe5sm19327264f8f.73.2025.03.04.16.53.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 04 Mar 2025 16:53:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , =?utf-8?q?Daniel_P=2E_Berra?= =?utf-8?q?ng=C3=A9?= , Richard Henderson , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [RFC PATCH 11/11] qemu: Remove C definitions of TARGET_NAME Date: Wed, 5 Mar 2025 01:52:25 +0100 Message-ID: <20250305005225.95051-12-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250305005225.95051-1-philmd@linaro.org> References: <20250305005225.95051-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philmd@linaro.org; helo=mail-wr1-x42b.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-devel@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-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We don't use TARGET_NAME anymore, remove and poison it globally. The symbol is still defined in Makefiles by the configure script (it is required by tests/tcg/). Signed-off-by: Philippe Mathieu-Daudé --- meson.build | 4 +++- include/exec/poison.h | 1 - include/qemu/osdep.h | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 04d8c477644..eaae1da2e92 100644 --- a/meson.build +++ b/meson.build @@ -3347,7 +3347,9 @@ foreach target : target_dirs # Note that TARGET_BASE_ARCH ends up in config-target.h but it is # not used to select files from sourcesets. config_target_data.set('TARGET_' + v.to_upper(), 1) - elif k == 'TARGET_NAME' or k == 'CONFIG_QEMU_INTERP_PREFIX' + elif k == 'TARGET_NAME' + # do nothing + elif k == 'CONFIG_QEMU_INTERP_PREFIX' config_target_data.set_quoted(k, v) elif v == 'y' config_target_data.set(k, 1) diff --git a/include/exec/poison.h b/include/exec/poison.h index f4283f693af..0c4ad04eb97 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -34,7 +34,6 @@ #pragma GCC poison TARGET_XTENSA #pragma GCC poison TARGET_HAS_BFLT -#pragma GCC poison TARGET_NAME #pragma GCC poison TARGET_SUPPORTS_MTTCG #pragma GCC poison TARGET_BIG_ENDIAN #pragma GCC poison BSWAP_NEEDED diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 4397a906807..3167fda68e4 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -50,6 +50,8 @@ */ #pragma GCC poison TARGET_WORDS_BIGENDIAN +#pragma GCC poison TARGET_NAME + #include "qemu/compiler.h" /* Older versions of C++ don't get definitions of various macros from