From patchwork Tue Apr 16 03:27:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 1923958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=hNJGczIW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VJTym0x1Nz1yZ2 for ; Tue, 16 Apr 2024 13:28:32 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 80F0B3858C98 for ; Tue, 16 Apr 2024 03:28:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by sourceware.org (Postfix) with ESMTPS id 734F73858D32 for ; Tue, 16 Apr 2024 03:28:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 734F73858D32 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 734F73858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::630 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713238090; cv=none; b=k4gXlNDp5y6iuW7fax8pcUw/yJx7A+rbGjGYmMdMzjWBHDduD3MCzA9woeZvDaJ8cRSXkC7MZMw/IxnSd994QCfwCemkA1UbO4yz+a9KSQRzvqcsRp4HPhGKN0htKETtCls3EknammZ6txK1eXSi1l2sa+sQmzUltm1p7Qjav4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1713238090; c=relaxed/simple; bh=WRfrZJcBC708Os3P4sDKZmTzRC6evsL8Zg+wP9FFWA8=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=UMfms4QLlb+Gi8hD0QmI6AMi7IX2jZR+qh1V1K6QApLFjtneQN+biZJ4HoJn0AJtYucrwOQCGD1+ZJvIXseV34v3xOl+96LchbnMEd9BynNOX4GEoLJ0k4cxhU9iEriL/yC0oZf/QT4crZG6Q+CWuxnxFyKHijzyBuC3XZtCa3M= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1e2b137d666so32380315ad.2 for ; Mon, 15 Apr 2024 20:28:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1713238087; x=1713842887; darn=gcc.gnu.org; h=mime-version:user-agent:message-id:date:organization:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=l+gWKu5akvzaYNCoc3y06AVTSXCCCAdaeBlrFkIUiF0=; b=hNJGczIWOZTTvtJ24akzGq5y3VIO4s4j+eiflePZY0taC4wb4jolhujdBhm7yQYwAu 9mojUSTRluy4TMSCPXMbTkW4kJUXT74zRjL7mjesKcyaH039zSURIUBY2bkJmGzsCO0V 93cTQTg+oZUIOsNQW5Ynmq6vWP6pIrsoYv+m3ADem9ZEyqv1GL7i3kFVruifvNA+RWgh d9cUJJtqQOcy4uQujgSqGODcWMoGdKkTFlPV//AREiYEKYKvqxF3OZvcPfHxjsu3jUob 7aJAc9Cpfaw0YqlQ5pVmf5UVeJS/3Oq88kCSpwRtXyaPJI3C0yS1SjxCcJLUrsEzagZC ZZkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713238087; x=1713842887; h=mime-version:user-agent:message-id:date:organization:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l+gWKu5akvzaYNCoc3y06AVTSXCCCAdaeBlrFkIUiF0=; b=Livu1JOUFAFktg5XEOzwEpn4rd1w+bsc3LwjwS3C4dEM6/jdDaCWUCgFhZGsrlA1TY kZ5ThsSxp7gXEUKLxX3SsV60m7EN0iY2kDvzXKTE5cXsoDlvE6HdWwAmcIM+vN95RP9T vrbV6AGY5ViGNKNqQDy6njkcNmIqXFl/uHKATiOUlFog8Xq7DyS2C39eJHVBeFZj3ADa v8rs9fIfbNkBOme0X7cWWP9g5N3E48BBctYsK9uKa1kCtNZtVTRCgOCaks0lTqJnc2CJ GDIo6eIM532yTWHu+uGV7HU2edanqFaGhTsllTQ9FMDNOQ3i0yxp4/UtDIF0nvt/xZq0 PwEA== X-Gm-Message-State: AOJu0Yzq6T4xpsNdEuhiqp4yF6mOgzha6C+fYJXJlj7bcQAl3DlWxgBi pJvOMnw1s8oZkK1FGyPOcRa2Yn9wq0IA+9I6WK1Nt45ARQdnIsZ7pOZvsdxqTpviOyybnsBfPO5 /0A== X-Google-Smtp-Source: AGHT+IE1gfbPxoiexxuN58WsY6NN8xCwcoFVE5+OD7whwlimzebnla7wpC281HtOtPckVzqDosXGlA== X-Received: by 2002:a17:902:780a:b0:1e2:a42a:af5d with SMTP id p10-20020a170902780a00b001e2a42aaf5dmr12194038pll.30.1713238087299; Mon, 15 Apr 2024 20:28:07 -0700 (PDT) Received: from free.home ([2804:7f1:218b:5e2:c43b:e0c4:71a:241b]) by smtp.gmail.com with ESMTPSA id y8-20020a170902d64800b001db37fd26bcsm8700687plh.116.2024.04.15.20.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 20:28:06 -0700 (PDT) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 43G3RuAT2387503 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 16 Apr 2024 00:27:57 -0300 From: Alexandre Oliva To: gcc-patches@gcc.gnu.org Cc: hainque@adacore.com Subject: [PATCH] [vxworks] avoid mangling __STDC_VERSION_LIMITS_H__ Organization: Free thinker, does not speak for AdaCore Date: Tue, 16 Apr 2024 00:27:56 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, WEIRD_QUOTING autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 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 The mangling of the macro name that guards limits.h from reinclusion was mangling a c23-required macro as well. Make the edit pattern stricter. Regstrapped on x86_64-linux-gnu. Also tested with gcc-13 on arm-, aarch64-, x86- and x86_64-vxworks7r2. Ok to install? for gcc/ChangeLog * config/t-vxworks (vxw-glimits.h): Don't mangle c23-required __STDC_VERSION_LIMITS_H__ define. --- gcc/config/t-vxworks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/config/t-vxworks b/gcc/config/t-vxworks index b89350c3c70f4..6063943e346e6 100644 --- a/gcc/config/t-vxworks +++ b/gcc/config/t-vxworks @@ -57,7 +57,7 @@ T_GLIMITS_H = vxw-glimits.h vxw-glimits.h: $(srcdir)/glimits.h ID=`echo $(BASEVER_c) | sed -e 's/\./_/g'` && \ - sed -e "s/_LIMITS_H__/_LIMITS_H__$${ID}_/" < $< > $@T + sed -e "s/_LIMITS_H___/_LIMITS_H__$${ID}_/" < $< > $@T mv $@T $@ # Arrange to "provide" a tailored version of stdint-gcc.h