FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix gdb build with -std=gnu++11

Browse source 
The options framework series broken the build with gcc 4.8, or any
other compiler were we end up forcing -std=gnu++11, causing errors
like these:

 ../../binutils-gdb/gdb/compile/compile.c: In function gdb::option::option_def_group make_compile_options_def_group(compile_options*):
 ../../binutils-gdb/gdb/compile/compile.c:266:44: error: could not convert (const gdb::option::option_def*)(& compile_command_option_defs) from const gdb::option::option_def* to gdb::array_view<const gdb::option::option_def>
    return {compile_command_option_defs, opts};
					     ^
   CXX    copying.o
 ../../binutils-gdb/gdb/compile/compile.c:267:1: error: control reaches end of non-void function [-Werror=return-type]
  }
  ^

This is a C++11 vs C++14 difference -- C++14 relaxed the rules for
eliding braces.

This commit fixes it by adding the missing (in C++11) braces.  Tested
with g++ 4.8.

gdb/ChangeLog:
2019-06-13  Pedro Alves  <palves@redhat.com>

	* compile/compile.c (make_compile_options_def_group): Add braces
	around array_view initializer.
	* thread.c (make_thread_apply_all_options_def_group)
	(make_thread_apply_all_options_def_group): Likewise.
This commit is contained in:
Pedro Alves 2019-06-13 08:58:54 +01:00
parent e41d1c49a1
commit 66eb1ed388
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

@ -1,3 +1,10 @@
2019-06-13 Pedro Alves <palves@redhat.com>
* compile/compile.c (make_compile_options_def_group): Add braces
around array_view initializer.
* thread.c (make_thread_apply_all_options_def_group)
(make_thread_apply_all_options_def_group): Likewise.
2019-06-13 Pedro Alves <palves@redhat.com> 2019-06-13 Pedro Alves <palves@redhat.com>
* NEWS (New commands): Mention "maint test-options * NEWS (New commands): Mention "maint test-options

2
gdb/compile/compile.c
View file

@ -263,7 +263,7 @@ static const gdb::option::option_def compile_command_option_defs[] = {
static gdb::option::option_def_group static gdb::option::option_def_group
make_compile_options_def_group (compile_options *opts) make_compile_options_def_group (compile_options *opts)
{ {
return {compile_command_option_defs, opts}; return {{compile_command_option_defs}, opts};
} }
/* Handle the input from the 'compile file' command. The "compile /* Handle the input from the 'compile file' command. The "compile

6
gdb/thread.c
View file

@ -1531,8 +1531,8 @@ make_thread_apply_all_options_def_group (int *ascending,
qcs_flags *flags) qcs_flags *flags)
{ {
return {{ return {{
{ ascending_option_def.def (), ascending}, { {ascending_option_def.def ()}, ascending},
{ thr_qcs_flags_option_defs, flags }, { {thr_qcs_flags_option_defs}, flags },
}}; }};
} }
@ -1542,7 +1542,7 @@ make_thread_apply_all_options_def_group (int *ascending,
static inline gdb::option::option_def_group static inline gdb::option::option_def_group
make_thread_apply_options_def_group (qcs_flags *flags) make_thread_apply_options_def_group (qcs_flags *flags)
{ {
return {thr_qcs_flags_option_defs, flags}; return {{thr_qcs_flags_option_defs}, flags};
} }
/* Apply a GDB command to a list of threads. List syntax is a whitespace /* Apply a GDB command to a list of threads. List syntax is a whitespace