From 58785d9888c699770154ef1d42fcea7598e8d704 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 17 Mar 2019 22:27:31 +0000 Subject: [PATCH] gdb: unconditionally define _initialize_string_view_selftests The build failure was noticed by Helmut Jarausch in https://bugs.gentoo.org/680232: $ ./configure CXXFLAGS='-std=c++17 -Os' ... CXXLD gdb ld: init.o: in function `initialize_all_files()': init.c:(.text+0x113): undefined reference to `_initialize_string_view_selftests()' It happens because '_initialize_string_view_selftests()' is conditionally defined based on C++ default. The change defines '_initialize_string_view_selftests()' unconditionally and leaves implementation a no-op on c++17 compilers. gdb/ChangeLog: 2019-03-17 Sergei Trofimovich * unittests/string_view-selftests.c: Define _initialize_string_view_selftests unconditionally. --- gdb/ChangeLog | 5 +++++ gdb/unittests/string_view-selftests.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cb7f6b0..0c39c19 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-03-17 Sergei Trofimovich + + * unittests/string_view-selftests.c: Define + _initialize_string_view_selftests unconditionally. + 2019-03-17 Vladimir Martyanov PR gdb/24350 diff --git a/gdb/unittests/string_view-selftests.c b/gdb/unittests/string_view-selftests.c index 21a10e6..b2a2bf7 100644 --- a/gdb/unittests/string_view-selftests.c +++ b/gdb/unittests/string_view-selftests.c @@ -170,10 +170,12 @@ run_tests () } /* namespace string_view */ } /* namespace selftests */ +#endif /* __cplusplus < 201703L */ + void _initialize_string_view_selftests () { +#if defined(GDB_STRING_VIEW) selftests::register_test ("string_view", selftests::string_view::run_tests); +#endif } - -#endif /* __cplusplus < 201703L */ -- 2.7.4