From 6655b152ebbf97e66888dc003414f6bb62a7edab Mon Sep 17 00:00:00 2001
From: Etienne Servais <servais@adacore.com>
Date: Tue, 8 Feb 2022 12:17:48 +0100
Subject: [PATCH] [Ada] Fix support for ISO-8859-15 and IBM CP 850 encoding

In ISO-8859-15, code for "lower y with diaeresis" is used for the upper
case.  In IBM CP 850, upper and lower o with stroke were missing.

gcc/ada/

	* csets.adb (Fold_Latin_9): Fix y with diaeresis.
	(Fold_IBM_PC_850): Fix o with stroke.
---
 gcc/ada/csets.adb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gcc/ada/csets.adb b/gcc/ada/csets.adb
index bd2ba92..5feb3ee 100644
--- a/gcc/ada/csets.adb
+++ b/gcc/ada/csets.adb
@@ -558,7 +558,7 @@ package body Csets is
       'q' => 'Q',  X_A8 => X_A6,
       'r' => 'R',  X_B8 => X_B4,
       's' => 'S',  X_BD => X_BC,
-      't' => 'T',  X_BE => X_FF,
+      't' => 'T',  X_BE => X_BE,
       'u' => 'U',
       'v' => 'V',
       'w' => 'W',
@@ -581,7 +581,7 @@ package body Csets is
       'M' => 'M',  X_CC => X_CC,  X_DC => X_DC,
       'N' => 'N',  X_CD => X_CD,  X_DD => X_DD,
       'O' => 'O',  X_CE => X_CE,  X_DE => X_DE,
-      'P' => 'P',  X_CF => X_CF,  X_DF => X_DF,  X_FF => X_FF,
+      'P' => 'P',  X_CF => X_CF,  X_DF => X_DF,  X_FF => X_BE,
       'Q' => 'Q',  X_A6 => X_A6,
       'R' => 'R',  X_B4 => X_B4,
       'S' => 'S',  X_BC => X_BC,
@@ -835,6 +835,8 @@ package body Csets is
       X_98 => X_98,  -- y umlaut
       X_99 => X_99,  -- O umlaut
       X_9A => X_9A,  -- U umlaut
+      X_9B => X_9D,  -- o with stroke
+      X_9D => X_9D,  -- O with stroke
 
       X_A0 => X_B5,  -- a acute
       X_A1 => X_D6,  -- i acute
-- 
2.7.4