From 05cd79c2420d3fe6d84bad694d9808982112b0f0 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Sun, 15 Jan 2023 16:36:34 +0000
Subject: [PATCH] libstdc++: Remove dg-xfail-run-if in std/time/tzdb_list/1.cc

Use the global override_used to tell whether the target supports the
override functionality that the test_reload and test_erase functions
rely on.

libstdc++-v3/ChangeLog:

	* testsuite/std/time/tzdb_list/1.cc: Remove dg-xfail-run-if
	and fail gracefully if defining the weak symbol doesn't work.
---
 libstdc++-v3/testsuite/std/time/tzdb_list/1.cc | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc b/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
index 2b121ff..e52f346 100644
--- a/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
+++ b/libstdc++-v3/testsuite/std/time/tzdb_list/1.cc
@@ -2,13 +2,13 @@
 // { dg-do run { target c++20 } }
 // { dg-require-effective-target tzdb }
 // { dg-require-effective-target cxx11_abi }
-// { dg-xfail-run-if "no weak override on AIX" { powerpc-ibm-aix* } }
 
 #include <chrono>
 #include <fstream>
+#include <cstdio>
 #include <testsuite_hooks.h>
 
-static bool override_used = true;
+static bool override_used = false;
 
 namespace __gnu_cxx
 {
@@ -119,6 +119,12 @@ int main()
   std::ofstream("tzdata.zi") << tzdata_zi;
 
   test_access();
-  test_reload();
-  test_erase();
+
+  if (override_used)
+  {
+    test_reload();
+    test_erase();
+  }
+  else
+    std::puts("__gnu_cxx::zoneinfo_dir_override() doesn't work on this target");
 }
-- 
2.7.4