From b3e82ed8839aa3b72deabe3cc6df3aa96fadec83 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 12 May 2023 13:38:50 +0100
Subject: [PATCH] libstdc++: Remove test dependency on
 _GLIBCXX_USE_C99_STDINT_TR1

This should have been removed in r9-2029-g612c9c702e2c9e when the
char16_t and char32_t specializations of std::codecvt were changed to be
defined unconditionally.

libstdc++-v3/ChangeLog:

	* testsuite/22_locale/locale/cons/unicode.cc: Remove dependency
	on _GLIBCXX_USE_C99_STDINT_TR1.
---
 libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
index 0520b637be5..7fbbcae2aa3 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
@@ -33,14 +33,12 @@ typedef std::codecvt<char, char, std::mbstate_t> 	      c_codecvt;
 typedef std::codecvt<wchar_t, char, std::mbstate_t>	      w_codecvt;
 #endif
 
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
 typedef std::codecvt<char16_t, char, std::mbstate_t>	      u16_codecvt;
 typedef std::codecvt<char32_t, char, std::mbstate_t>	      u32_codecvt;
 #ifdef _GLIBCXX_USE_CHAR8_T
 typedef std::codecvt<char16_t, char8_t, std::mbstate_t>	      u16u8_codecvt;
 typedef std::codecvt<char32_t, char8_t, std::mbstate_t>	      u32u8_codecvt;
 #endif
-#endif
 
 class gnu_facet: public std::locale::facet
 {
@@ -69,13 +67,11 @@ void test01()
 #ifdef _GLIBCXX_USE_WCHAR_T
       VERIFY( has_facet<w_codecvt>(loc13) );
 #endif
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
       VERIFY( has_facet<u16_codecvt>(loc13) );
       VERIFY( has_facet<u32_codecvt>(loc13) );
 #ifdef _GLIBCXX_USE_CHAR8_T
       VERIFY( has_facet<u16u8_codecvt>(loc13) );
       VERIFY( has_facet<u32u8_codecvt>(loc13) );
-#endif
 #endif
       VERIFY( has_facet<unicode_codecvt>(loc13) );
     }