about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2021-08-02 16:33:44 +0000
committerFangrui Song <maskray@google.com>2022-10-27 11:29:56 -0700
commit7255e947f2ee7700d0a2f4115f9598e2dd8f3c2c (patch)
tree49abd655e34d3d8bb6a406184c52c52c321da4e2
parent2fa202fdd10de62ca436d567f12ccc3e40f29476 (diff)
downloadglibc-7255e947f2ee7700d0a2f4115f9598e2dd8f3c2c.tar.gz
glibc-7255e947f2ee7700d0a2f4115f9598e2dd8f3c2c.tar.xz
glibc-7255e947f2ee7700d0a2f4115f9598e2dd8f3c2c.zip
Fix build of nptl/tst-thread_local1.cc with GCC 12
The test nptl/tst-thread_local1.cc fails to build with GCC mainline
because of changes to what libstdc++ headers implicitly include what
other headers:

tst-thread_local1.cc: In function 'int do_test()':
tst-thread_local1.cc:177:5: error: variable 'std::array<std::pair<const char*, std::function<void(void* (*)(void*))> >, 2> do_thread_X' has initializer but incomplete type
  177 |     do_thread_X
      |     ^~~~~~~~~~~

Fix this by adding an explicit include of <array>.

Tested with build-many-glibcs.py for aarch64-linux-gnu.

(cherry picked from commit 2ee9b24f47db8d0a8d0ccadb999335a1d4cfc364)
-rw-r--r--nptl/tst-thread_local1.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/nptl/tst-thread_local1.cc b/nptl/tst-thread_local1.cc
index 0cfdcd6d19..5f4cf5cc3b 100644
--- a/nptl/tst-thread_local1.cc
+++ b/nptl/tst-thread_local1.cc
@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <array>
 #include <functional>
 #include <string>
 #include <thread>