From patchwork Mon Nov 4 16:10:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 2006300 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=bmRpJLLF; 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 4XhxNt3FGCz1xwF for ; Tue, 5 Nov 2024 03:14:06 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7608D3857719 for ; Mon, 4 Nov 2024 16:14:04 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by sourceware.org (Postfix) with ESMTPS id C3916385770A for ; Mon, 4 Nov 2024 16:11:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C3916385770A 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 C3916385770A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::430 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730736710; cv=none; b=gCK8W+pLJnIjk7YspVuvSMixV9WZOSySlyng7Bk6Cbn6fLPrk3W+3Zj/R6CCVikvYwVX9QVm2VzZaSKlGBsf61dBFuV7CymJBOWGFGEla2xTpbf+IT2WvkWJUFPe9PpJd3DdoiwtqBfjDKrM8SS50W4ChJKhcC5PCDwAE8r8O5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730736710; c=relaxed/simple; bh=WdhXPPj4NLlGhrZayaEiQnnOUJOXJlxWuyoYQ9ZeOkY=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=lnNI9Tlol8mE052iMMabnWf7dvm2d5WR3BN5DKYwQZbzI2Tl02ZO8OiiI2KzvE4avo/BvUFqsXNULLNXDlgP7B+Iy1bqG6/3IYvhGU/5ry7fdLUeA8IBw+pGpBac1tZBmEv0Et1JF+xdlbfkH2u6P9xHLeoyj6dXNb/7L+C4RGg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-37ec4e349f4so2791052f8f.0 for ; Mon, 04 Nov 2024 08:11:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1730736693; x=1731341493; darn=gcc.gnu.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=wQbYCO2nVsecuYw9P203ycf2Tw+DUW7Oy1I9ldRaZeQ=; b=bmRpJLLFRLFxunzwX0eF7YRG4A1o3xpecrMykL2AsKNXyWq7m9p3NhfBQwetf2OIpK ptBiPN/SPo/zaaR9Yhr+IL+4YSa64Z2SK7vSQuVMoBoVAmT1So4hd8Nf3qbIvWUMb7PP zAF8BTLjyHaJ86jipYNg1cJeGs9YFv+nA8aKLGW3tunfNFXaSVHXHSa1dF+Cnsjm0S8g vYB+dlcmWAudxvlRda3QYT3qoKYUuP/cUz7Vg/P9meFhE39il3/8VALbiJ5rfs2X8KZm Knc95LyyJBWsUDFU/BIc9gBO4r+/M/ItOQacdoA+Br15Z4XeREiPSb35kQGC83ll8DH7 6eUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730736693; x=1731341493; 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=wQbYCO2nVsecuYw9P203ycf2Tw+DUW7Oy1I9ldRaZeQ=; b=tNExQ0fnabl1h3uF2Sw+HvPJNvDCsz3jDpiZlpPpSvztQIyhK4oVKlljQOY2zCozmO ZswFleLtTP7fzOVWMQ+eemlzOdSZ8F+PIkctSLV6sPrSwmcbw41NemeXZF9MiW9AiCqH 0sjjOmsnKpmJ4CiTEcoWfMF8oXNDkSLdMnNO1kZ7G1cADgqOnoVel5oicssaXyit2qKo AerSg3TgTzVGE1qPYoToAH9U4kH1a+hgA7RjXmzLhP/cMEkpjr5IJ+H6H4lcqOeKvlS9 dAo7kzw4ZoXrAzu8lVu5kEVPnJrK3aOiYn1nppFE1IHuJhgd6tODvWzBdjpMxCmz4Ybb TeGA== X-Gm-Message-State: AOJu0YxO5YB8l8srHf1J2K6J0MrxoWokzUGduZ4S931+aGBVcF4ktyHA EsuD9sOkpuBUqlLpAD7Hi65OM5M97pc3xTyLnA8wb7xCpH1e0KqNJH06jBNDJZ57kQkj/MTCuS0 = X-Google-Smtp-Source: AGHT+IHWr+3gZWvoTWs0YoOxQx5rp5cbQz3C+9Ic5WJSZDVNok7koY3Xh5jXoJkcRdzCpdScqWUm5w== X-Received: by 2002:a5d:6c68:0:b0:374:af19:7992 with SMTP id ffacd0b85a97d-381c7a47487mr8123776f8f.7.1730736693467; Mon, 04 Nov 2024 08:11:33 -0800 (PST) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-381c10e747csm13574463f8f.64.2024.11.04.08.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Nov 2024 08:11:33 -0800 (PST) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED 10/38] ada: Minor tweaks in comments Date: Mon, 4 Nov 2024 17:10:45 +0100 Message-ID: <20241104161116.1431659-10-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241104161116.1431659-1-poulhies@adacore.com> References: <20241104161116.1431659-1-poulhies@adacore.com> MIME-Version: 1.0 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 From: Eric Botcazou They are related to the special support for text encoding on Windows. gcc/ada/ChangeLog: * adaint.c: Replace initialize.c with rtinit.c in comment. * sysdep.c (__gnat_set_mode): Fix reference in comment. * libgnat/i-cstrea.ads (Content_Encoding): Adjust comment. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/adaint.c | 2 +- gcc/ada/libgnat/i-cstrea.ads | 2 +- gcc/ada/sysdep.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index f26d69a1a2a..9ccac305dde 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -175,7 +175,7 @@ extern "C" { #include "mingw32.h" -/* Current code page and CCS encoding to use, set in initialize.c. */ +/* Current code page and CCS encoding to use, set in rtinit.c. */ UINT __gnat_current_codepage; UINT __gnat_current_ccs_encoding; diff --git a/gcc/ada/libgnat/i-cstrea.ads b/gcc/ada/libgnat/i-cstrea.ads index 756db48e75c..ba75c21b231 100644 --- a/gcc/ada/libgnat/i-cstrea.ads +++ b/gcc/ada/libgnat/i-cstrea.ads @@ -235,9 +235,9 @@ package Interfaces.C_Streams is -- In this mode we are eventually using the system-wide -- translation if activated. -- Text : Text encoding activated + -- U8text : Unicode UTF-8 encoding -- Wtext : Unicode mode -- U16text : Unicode UTF-16 encoding - -- U8text : Unicode UTF-8 encoding -- -- This encoding is system dependent and only used on Windows systems. -- diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c index 254c736bec4..1f65f433f50 100644 --- a/gcc/ada/sysdep.c +++ b/gcc/ada/sysdep.c @@ -177,8 +177,8 @@ __gnat_set_text_mode (int handle) void __gnat_set_mode (int handle, int mode) { - /* the values here must be synchronized with - System.File_Control_Block.Content_Encodding: + /* The values here must be synchronized with + Interfaces.C_Streams.Content_Encoding: None = 0 Default_Text = 1 @@ -200,8 +200,8 @@ __gnat_set_mode (int handle, int mode) void __gnat_set_mode (int handle, int mode) { - /* the values here must be synchronized with - System.File_Control_Block.Content_Encodding: + /* The values here must be synchronized with + Interfaces.C_Streams.Content_Encoding: None = 0 Default_Text = 1