diff options
author | Simon Marchi <simon.marchi@polymtl.ca> | 2021-12-02 08:23:12 -0500 |
---|---|---|
committer | Simon Marchi <simon.marchi@polymtl.ca> | 2021-12-02 08:24:25 -0500 |
commit | 6cade9185cc55478830559d91593ba510bef1b17 (patch) | |
tree | 58c0950a7b559e2e65f03993dbbad3aaa2b9c7cd /gdb/target/waitstatus.c | |
parent | 1075011adebffc855319569549ce88e389e149c6 (diff) | |
download | gdb-6cade9185cc55478830559d91593ba510bef1b17.zip gdb-6cade9185cc55478830559d91593ba510bef1b17.tar.gz gdb-6cade9185cc55478830559d91593ba510bef1b17.tar.bz2 |
gdb, include: replace pragmas with DIAGNOSTIC macros, fix build with g++ 4.8
When introducing this code, I forgot that we had some macros for this.
Replace some "manual" pragma diagnostic with some DIAGNOSTIC_* macros,
provided by include/diagnostics.h.
In diagnostics.h:
- Add DIAGNOSTIC_ERROR, to enable a diagnostic at error level.
- Add DIAGNOSTIC_ERROR_SWITCH, to enable -Wswitch at error level, for
both gcc and clang.
Additionally, using DIAGNOSTIC_PUSH, DIAGNOSTIC_ERROR_SWITCH and
DIAGNOSTIC_POP seems to misbehave with g++ 4.8, where we see these
errors:
CXX ada-tasks.o
/home/smarchi/src/binutils-gdb/gdb/ada-tasks.c: In function void read_known_tasks():
/home/smarchi/src/binutils-gdb/gdb/ada-tasks.c:998:10: error: enumeration value ADA_TASKS_UNKNOWN not handled in switch [-Werror=switch]
switch (data->known_tasks_kind)
^
Because of the POP, the diagnostic should go back to being disabled,
since it was disabled in the beginning, but that's not what we see
here. Versions of GCC >= 5 compile correctly.
Work around this by making DIAGNOSTIC_ERROR_SWITCH a no-op for GCC < 5.
Note that this code (already as it exists in master today) enables
-Wswitch at the error level even if --disable-werror is passed. It
shouldn't be a problem, as it's not like a new enumerator will appear
out of nowhere and cause a build error if building with future
compilers. Still, for correctness, we would ideally want to ask the
compiler to enable -Wswitch at its default level (as if the user had
passed -Wswitch on the command-line). There doesn't seem to be a way to
do this.
Change-Id: Id33ebec3de39bd449409ea0bab59831289ffe82d
Diffstat (limited to 'gdb/target/waitstatus.c')
-rw-r--r-- | gdb/target/waitstatus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/target/waitstatus.c b/gdb/target/waitstatus.c index a7209e3..0fbcec5 100644 --- a/gdb/target/waitstatus.c +++ b/gdb/target/waitstatus.c @@ -30,8 +30,8 @@ target_waitstatus::to_string () const /* Make sure the compiler warns if a new TARGET_WAITKIND enumerator is added but not handled here. */ -#pragma GCC diagnostic push -#pragma GCC diagnostic error "-Wswitch" +DIAGNOSTIC_PUSH +DIAGNOSTIC_ERROR_SWITCH switch (this->kind ()) { case TARGET_WAITKIND_EXITED: @@ -63,7 +63,7 @@ target_waitstatus::to_string () const case TARGET_WAITKIND_THREAD_CREATED: return str; } -#pragma GCC diagnostic pop +DIAGNOSTIC_POP gdb_assert_not_reached ("invalid target_waitkind value: %d", (int) this->kind ()); |