diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2021-01-04 21:40:41 +0100 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2021-01-14 18:50:10 +0100 |
| commit | 58eadc4b691b5c943a9b8879420242ffc6d498c7 (patch) | |
| tree | aedc0aaf4c520fa1b24d12ae012a2f8600ac924a | |
| parent | 8ca9c7eb6773dd3cc9c536787b3489d36356ccf7 (diff) | |
| download | gdb-58eadc4b691b5c943a9b8879420242ffc6d498c7.zip gdb-58eadc4b691b5c943a9b8879420242ffc6d498c7.tar.gz gdb-58eadc4b691b5c943a9b8879420242ffc6d498c7.tar.bz2 | |
Fix building gdb with gcc-4.x
Since is_trivially_default_constructible was not implemented before gcc-5
it cannot be used with gcc-4.x.
Fix the build by using conditional compilation around that line.
Use the equivalent is_trivially_constructible<T> instead, since
we already have HAVE_IS_TRIVIALLY_CONSTRUCTIBLE for that purpose.
Fixes: 098caef485a ("Refactor struct trad_frame_saved_regs")
gdb:
2021-01-14 Bernd Edlinger <bernd.edlinger@hotmail.de>
* trad-frame.c (trad_frame_alloc_saved_regs): Avoid compile-error
because is_trivially_default_constructible was first implemented with
gcc-5.
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/trad-frame.c | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c290957..15d332c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2021-01-14 Bernd Edlinger <bernd.edlinger@hotmail.de> + + * trad-frame.c (trad_frame_alloc_saved_regs): Avoid compile-error + because is_trivially_default_constructible was first implemented with + gcc-5. + 2021-01-14 Tom de Vries <tdevries@suse.de> PR breakpoints/27151 diff --git a/gdb/trad-frame.c b/gdb/trad-frame.c index 17375e8..3284c45 100644 --- a/gdb/trad-frame.c +++ b/gdb/trad-frame.c @@ -25,6 +25,7 @@ #include "target.h" #include "value.h" #include "gdbarch.h" +#include "gdbsupport/traits.h" struct trad_frame_cache { @@ -60,7 +61,9 @@ trad_frame_reset_saved_regs (struct gdbarch *gdbarch, trad_frame_saved_reg * trad_frame_alloc_saved_regs (struct gdbarch *gdbarch) { - gdb_static_assert (std::is_trivially_default_constructible<trad_frame_saved_reg>::value); +#ifdef HAVE_IS_TRIVIALLY_CONSTRUCTIBLE + gdb_static_assert (std::is_trivially_constructible<trad_frame_saved_reg>::value); +#endif int numregs = gdbarch_num_cooked_regs (gdbarch); trad_frame_saved_reg *this_saved_regs |