From 9e41188f8df9a854d264bfc4dc350e101ba38867 Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Mon, 4 Jun 2018 16:26:33 -0400 Subject: [PATCH] Rebase to FSF GDB 8.1.50.20180529 (8.2pre). --- .gitignore | 3 +- _git_upstream_commit | 2 +- gdb-6.3-gstack-20050411.patch | 8 +-- gdb-6.3-ppc64syscall-20040622.patch | 10 ++-- gdb-6.5-bz203661-emit-relocs.patch | 2 +- gdb-6.6-buildid-locate-rpm-scl.patch | 6 +-- gdb-6.6-buildid-locate.patch | 12 ++--- gdb-6.8-quit-never-aborts.patch | 2 +- gdb-archer-pie-addons-keep-disabled.patch | 2 +- gdb-archer-pie-addons.patch | 4 +- gdb-archer-vla-tests.patch | 2 +- gdb-archer.patch | 8 +-- gdb-bz541866-rwatch-before-run.patch | 2 +- gdb-bz568248-oom-is-error.patch | 2 +- gdb-container-rh-pkg.patch | 4 +- gdb-glibc-strstr-workaround.patch | 4 +- gdb-gnat-dwarf-crash-3of3.patch | 7 ++- gdb-python-gil.patch | 2 +- gdb-rhbz795424-bitpos-20of25.patch | 65 +++++++++++------------ gdb-rhbz795424-bitpos-21of25.patch | 10 ++-- gdb-rhbz795424-bitpos-22of25.patch | 22 ++++---- gdb-rhbz795424-bitpos-23of25.patch | 6 +-- gdb-vla-intel-fortran-strides.patch | 18 +++---- gdb-vla-intel-fortran-vla-strings.patch | 48 ++++++++--------- gdb-vla-intel-stringbt-fix.patch | 2 +- gdb.spec | 7 ++- sources | 2 +- 27 files changed, 129 insertions(+), 133 deletions(-) diff --git a/.gitignore b/.gitignore index 96985c5..c26b5d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /gdb-libstdc++-v3-python-7.1.1-20170526.tar.xz /v1.6.1.tar.gz -/gdb-8.1.tar.xz -/gdb-8.1.50.20180522.tar.xz +/gdb-8.1.50.20180529.tar.xz diff --git a/_git_upstream_commit b/_git_upstream_commit index e853d25..688cd57 100644 --- a/_git_upstream_commit +++ b/_git_upstream_commit @@ -1 +1 @@ -75d74ccace05f6166a45dbaa352abf753891d3be +b8283aea9e599f17dbae7f52223994e3a9168143 diff --git a/gdb-6.3-gstack-20050411.patch b/gdb-6.3-gstack-20050411.patch index 449b7db..73301c3 100644 --- a/gdb-6.3-gstack-20050411.patch +++ b/gdb-6.3-gstack-20050411.patch @@ -16,10 +16,10 @@ FileName: gdb-6.3-gstack-20050411.patch * gstack.sh, gstack.1: New files. diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index 09a2ad2ca3..1ea7a36c69 100644 +index 5b650c6643..8c487916d2 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -1727,7 +1727,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force +@@ -1729,7 +1729,7 @@ info install-info clean-info dvi pdf install-pdf html install-html: force install: all @$(MAKE) $(FLAGS_TO_PASS) install-only @@ -28,7 +28,7 @@ index 09a2ad2ca3..1ea7a36c69 100644 transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e "$$t"` ; \ if test "x$$transformed_name" = x; then \ -@@ -1776,7 +1776,25 @@ install-guile: +@@ -1778,7 +1778,25 @@ install-guile: install-python: $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_DATADIR)/python/gdb @@ -55,7 +55,7 @@ index 09a2ad2ca3..1ea7a36c69 100644 transformed_name=`t='$(program_transform_name)'; \ echo gdb | sed -e $$t` ; \ if test "x$$transformed_name" = x; then \ -@@ -1799,6 +1817,18 @@ uninstall: force $(CONFIG_UNINSTALL) +@@ -1801,6 +1819,18 @@ uninstall: force $(CONFIG_UNINSTALL) fi @$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do diff --git a/gdb-6.3-ppc64syscall-20040622.patch b/gdb-6.3-ppc64syscall-20040622.patch index 1bdc4b8..4e324c7 100644 --- a/gdb-6.3-ppc64syscall-20040622.patch +++ b/gdb-6.3-ppc64syscall-20040622.patch @@ -17,7 +17,7 @@ FileName: gdb-6.3-ppc64syscall-20040622.patch "func_start". diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c -index c5b49c5f46..4d1a241cdf 100644 +index ff4699c191..feed75fbf9 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -134,6 +134,7 @@ static const char *powerpc_vector_abi_string = "auto"; @@ -28,7 +28,7 @@ index c5b49c5f46..4d1a241cdf 100644 int offset; /* total size of frame --- the distance by which we decrement sp to allocate the frame */ -@@ -1610,7 +1611,6 @@ static CORE_ADDR +@@ -1426,7 +1427,6 @@ static CORE_ADDR skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, struct rs6000_framedata *fdata) { @@ -36,7 +36,7 @@ index c5b49c5f46..4d1a241cdf 100644 CORE_ADDR last_prologue_pc = pc; CORE_ADDR li_found_pc = 0; gdb_byte buf[4]; -@@ -1629,12 +1629,14 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, +@@ -1445,12 +1445,14 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, int minimal_toc_loaded = 0; int prev_insn_was_prologue_insn = 1; int num_skip_non_prologue_insns = 0; @@ -51,7 +51,7 @@ index c5b49c5f46..4d1a241cdf 100644 fdata->saved_gpr = -1; fdata->saved_fpr = -1; fdata->saved_vr = -1; -@@ -1668,6 +1670,55 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, +@@ -1484,6 +1486,55 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, break; op = extract_unsigned_integer (buf, 4, byte_order); @@ -107,7 +107,7 @@ index c5b49c5f46..4d1a241cdf 100644 if ((op & 0xfc1fffff) == 0x7c0802a6) { /* mflr Rx */ /* Since shared library / PIC code, which needs to get its -@@ -1857,9 +1908,9 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, +@@ -1673,9 +1724,9 @@ skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc, CORE_ADDR lim_pc, we have no line table information or the line info tells us that the subroutine call is not part of the line associated with the prologue. */ diff --git a/gdb-6.5-bz203661-emit-relocs.patch b/gdb-6.5-bz203661-emit-relocs.patch index dd2db52..a21a597 100644 --- a/gdb-6.5-bz203661-emit-relocs.patch +++ b/gdb-6.5-bz203661-emit-relocs.patch @@ -9,7 +9,7 @@ FileName: gdb-6.5-bz203661-emit-relocs.patch ;;=push+jan: There was some mail thread about it, this patch may be a hack. diff --git a/gdb/symfile.c b/gdb/symfile.c -index 7bc03fbb8f..661125dec5 100644 +index a57bd6a593..e9875a08de 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -3492,6 +3492,12 @@ default_symfile_relocate (struct objfile *objfile, asection *sectp, diff --git a/gdb-6.6-buildid-locate-rpm-scl.patch b/gdb-6.6-buildid-locate-rpm-scl.patch index dc6da5f..162fdae 100644 --- a/gdb-6.6-buildid-locate-rpm-scl.patch +++ b/gdb-6.6-buildid-locate-rpm-scl.patch @@ -100,10 +100,10 @@ index 5af9d66899..2ff93191c7 100644 { return strcoll (*ap, *bp); diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 328a07df82..45c22450b1 100644 +index cf0c887a2a..fa6744b377 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c -@@ -3478,6 +3478,16 @@ read_index_from_section (struct objfile *objfile, +@@ -3469,6 +3469,16 @@ read_index_from_section (struct objfile *objfile, "set use-deprecated-index-sections on". */ if (version < 6 && !deprecated_ok) { @@ -120,7 +120,7 @@ index 328a07df82..45c22450b1 100644 static int warning_printed = 0; if (!warning_printed) { -@@ -3489,6 +3499,10 @@ to use the section anyway."), +@@ -3480,6 +3490,10 @@ to use the section anyway."), warning_printed = 1; } return 0; diff --git a/gdb-6.6-buildid-locate.patch b/gdb-6.6-buildid-locate.patch index c2b4209..ce126fb 100644 --- a/gdb-6.6-buildid-locate.patch +++ b/gdb-6.6-buildid-locate.patch @@ -872,7 +872,7 @@ index 15fb609409..1f62db0239 100644 #endif /* BUILD_ID_H */ diff --git a/gdb/coffread.c b/gdb/coffread.c -index f24ec0713a..5c1c3e61ea 100644 +index 5345fb7998..66d725d4a3 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -733,7 +733,8 @@ coff_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) @@ -983,10 +983,10 @@ index c6175279da..76945950b9 100644 + &setlist, &showlist); } diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo -index 28f083f96e..403f5ca658 100644 +index 62ba1d25a4..06a8d6d2b3 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo -@@ -19558,6 +19558,27 @@ information files. +@@ -19561,6 +19561,27 @@ information files. @end table @@ -1015,10 +1015,10 @@ index 28f083f96e..403f5ca658 100644 @cindex debug link sections A debug link is a special section of the executable file named diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 4006f4a48f..266740f74c 100644 +index 7fe15e5d05..901ebeb4e5 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c -@@ -2690,7 +2690,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile) +@@ -2683,7 +2683,7 @@ dwarf2_get_dwz_file (struct dwarf2_per_objfile *dwarf2_per_objfile) } if (dwz_bfd == NULL) @@ -1223,7 +1223,7 @@ index a6dc14e3c9..54a10df155 100644 append options " -ex \"b $bpline\"" append options " -ex \"run\"" diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp -index 0f05d043f2..becda6a001 100644 +index ee66a38e08..83f2854faa 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1694,6 +1694,16 @@ proc default_gdb_start { } { diff --git a/gdb-6.8-quit-never-aborts.patch b/gdb-6.8-quit-never-aborts.patch index 647ca40..a2abda9 100644 --- a/gdb-6.8-quit-never-aborts.patch +++ b/gdb-6.8-quit-never-aborts.patch @@ -65,7 +65,7 @@ index 07b386dacb..e6c595505f 100644 /* Get out of tfind mode, and kill or detach all inferiors. */ TRY diff --git a/gdb/utils.c b/gdb/utils.c -index c816e2f897..db1c534560 100644 +index 42d4225595..8f9159bfa6 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -108,6 +108,13 @@ static std::chrono::steady_clock::duration prompt_for_continue_wait_time; diff --git a/gdb-archer-pie-addons-keep-disabled.patch b/gdb-archer-pie-addons-keep-disabled.patch index c29cb68..b301df6 100644 --- a/gdb-archer-pie-addons-keep-disabled.patch +++ b/gdb-archer-pie-addons-keep-disabled.patch @@ -77,7 +77,7 @@ index 4223158fbc..407cc531db 100644 extern void print_breakpoint (breakpoint *bp); diff --git a/gdb/objfiles.c b/gdb/objfiles.c -index f57f4f58b0..d31c0d6f56 100644 +index 0432ce6208..c009a40b09 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -875,6 +875,11 @@ objfile_relocate1 (struct objfile *objfile, diff --git a/gdb-archer-pie-addons.patch b/gdb-archer-pie-addons.patch index 590fdb8..08a1564 100644 --- a/gdb-archer-pie-addons.patch +++ b/gdb-archer-pie-addons.patch @@ -52,10 +52,10 @@ index 878c8b0302..cf1346161d 100644 #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK (TYPE_FIELD (thistype, n)) #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL(TYPE_FIELD(thistype,n)) diff --git a/gdb/value.c b/gdb/value.c -index aa6ca43b41..98c060c65f 100644 +index 6bb6b8eb61..3e0b2ff883 100644 --- a/gdb/value.c +++ b/gdb/value.c -@@ -2830,7 +2830,8 @@ value_static_field (struct type *type, int fieldno) +@@ -2829,7 +2829,8 @@ value_static_field (struct type *type, int fieldno) { case FIELD_LOC_KIND_PHYSADDR: retval = value_at_lazy (TYPE_FIELD_TYPE (type, fieldno), diff --git a/gdb-archer-vla-tests.patch b/gdb-archer-vla-tests.patch index 7c3a64c..7ff0cab 100644 --- a/gdb-archer-vla-tests.patch +++ b/gdb-archer-vla-tests.patch @@ -3692,7 +3692,7 @@ new file mode 100644 + writeln(s); { set breakpoint 2 here } +end. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp -index becda6a001..067be70c7a 100644 +index 83f2854faa..4402f78f79 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -169,6 +169,11 @@ proc gdb_unload {} { diff --git a/gdb-archer.patch b/gdb-archer.patch index c92d1ad..72753ee 100644 --- a/gdb-archer.patch +++ b/gdb-archer.patch @@ -17,10 +17,10 @@ commit 718a1618b2f691a7f407213bb50f100ac59f91c3 tromey/python diff --git a/gdb/Makefile.in b/gdb/Makefile.in -index 1ea7a36c69..b767caa735 100644 +index 8c487916d2..cbbefb91af 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in -@@ -2094,6 +2094,12 @@ stamp-h: $(srcdir)/config.in config.status +@@ -2096,6 +2096,12 @@ stamp-h: $(srcdir)/config.in config.status CONFIG_LINKS= \ $(SHELL) config.status @@ -56,7 +56,7 @@ index 5c7c0b4c2e..2014607e9e 100644 gdb/printer/bound_registers.py diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo -index 403f5ca658..4788dd9f0d 100644 +index 06a8d6d2b3..2fc7a46f46 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -1245,6 +1245,16 @@ for remote debugging. @@ -472,7 +472,7 @@ index b8e2d9049d..deb87c6a71 100644 extern const struct language_defn *python_language; diff --git a/gdb/python/python.c b/gdb/python/python.c -index 4233b37fa8..cc4b710df7 100644 +index f5829d6c08..a2a849f77d 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -95,6 +95,8 @@ const struct extension_language_defn extension_language_python = diff --git a/gdb-bz541866-rwatch-before-run.patch b/gdb-bz541866-rwatch-before-run.patch index e740c71..4507b1b 100644 --- a/gdb-bz541866-rwatch-before-run.patch +++ b/gdb-bz541866-rwatch-before-run.patch @@ -98,7 +98,7 @@ new file mode 100644 + +#endif /* NM_LINUX64_H */ diff --git a/gdb/configure.nat b/gdb/configure.nat -index 6b0f44fede..dd0c63c256 100644 +index bcaeaf4583..28babcf0ad 100644 --- a/gdb/configure.nat +++ b/gdb/configure.nat @@ -237,6 +237,7 @@ case ${gdb_host} in diff --git a/gdb-bz568248-oom-is-error.patch b/gdb-bz568248-oom-is-error.patch index 161d621..4a905f2 100644 --- a/gdb-bz568248-oom-is-error.patch +++ b/gdb-bz568248-oom-is-error.patch @@ -53,7 +53,7 @@ gdb/ * utils.c (nomem): Change internal_error to error. diff --git a/gdb/utils.c b/gdb/utils.c -index 9c5bf68e5a..7813df1436 100644 +index a2e933bc8d..c69c01efc1 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -746,13 +746,11 @@ malloc_failure (long size) diff --git a/gdb-container-rh-pkg.patch b/gdb-container-rh-pkg.patch index 99efe00..54157bf 100644 --- a/gdb-container-rh-pkg.patch +++ b/gdb-container-rh-pkg.patch @@ -9,10 +9,10 @@ FileName: gdb-container-rh-pkg.patch ;;=fedora diff --git a/gdb/remote.c b/gdb/remote.c -index 635cb266e8..a683df4a83 100644 +index 9eed75aa8c..ffaf01fa7d 100644 --- a/gdb/remote.c +++ b/gdb/remote.c -@@ -13667,7 +13667,17 @@ remote_target::pid_to_exec_file (int pid) +@@ -14048,7 +14048,17 @@ remote_target::pid_to_exec_file (int pid) char *annex = NULL; if (packet_support (PACKET_qXfer_exec_file) != PACKET_ENABLE) diff --git a/gdb-glibc-strstr-workaround.patch b/gdb-glibc-strstr-workaround.patch index dec6245..79f6630 100644 --- a/gdb-glibc-strstr-workaround.patch +++ b/gdb-glibc-strstr-workaround.patch @@ -9,10 +9,10 @@ FileName: gdb-glibc-strstr-workaround.patch ;;=fedora: Compatibility with RHELs (unchecked which ones). diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 266740f74c..d69f154af3 100644 +index 901ebeb4e5..76884243fe 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c -@@ -21376,6 +21376,26 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, +@@ -21272,6 +21272,26 @@ new_symbol (struct die_info *die, struct type *type, struct dwarf2_cu *cu, /* Cache this symbol's name and the name's demangled form (if any). */ SYMBOL_SET_LANGUAGE (sym, cu->language, &objfile->objfile_obstack); linkagename = dwarf2_physname (name, die, cu); diff --git a/gdb-gnat-dwarf-crash-3of3.patch b/gdb-gnat-dwarf-crash-3of3.patch index 5763a6c..b4a0486 100644 --- a/gdb-gnat-dwarf-crash-3of3.patch +++ b/gdb-gnat-dwarf-crash-3of3.patch @@ -42,17 +42,16 @@ gdb/ * dwarf2read.c (process_die): Change gdb_assert to complaint. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 420c3e6bd5..328a07df82 100644 +index ae1c86acfe..cf0c887a2a 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c -@@ -10516,6 +10516,14 @@ private: +@@ -10491,6 +10491,13 @@ private: static void process_die (struct die_info *die, struct dwarf2_cu *cu) { + if (die->in_process) + { -+ complaint (&symfile_complaints, -+ _("DIE at 0x%s attempted to be processed twice"), ++ complaint (_("DIE at 0x%s attempted to be processed twice"), + sect_offset_str (die->sect_off)); + return; + } diff --git a/gdb-python-gil.patch b/gdb-python-gil.patch index 9ba2b09..d82cd52 100644 --- a/gdb-python-gil.patch +++ b/gdb-python-gil.patch @@ -41,7 +41,7 @@ index 26400f4fba..b8e2d9049d 100644 #endif diff --git a/gdb/python/python.c b/gdb/python/python.c -index db37331dc4..4233b37fa8 100644 +index c29e7d7a6b..f5829d6c08 100644 --- a/gdb/python/python.c +++ b/gdb/python/python.c @@ -556,12 +556,16 @@ execute_gdb_command (PyObject *self, PyObject *args, PyObject *kw) diff --git a/gdb-rhbz795424-bitpos-20of25.patch b/gdb-rhbz795424-bitpos-20of25.patch index 8aad2e2..8be6227 100644 --- a/gdb-rhbz795424-bitpos-20of25.patch +++ b/gdb-rhbz795424-bitpos-20of25.patch @@ -486,7 +486,7 @@ index 908b83a49a..dd69f50785 100644 return aarch64_linux_region_ok_for_watchpoint (addr, len); } diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c -index eaf30585f5..1962e4f07e 100644 +index 64bddc2670..e90e901027 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -78,7 +78,7 @@ static struct type *desc_bounds_type (struct type *); @@ -1372,10 +1372,10 @@ index 407cc531db..bc833e57eb 100644 /* Type of hardware watchpoint. */ target_hw_bp_type watchpoint_type {}; diff --git a/gdb/c-lang.c b/gdb/c-lang.c -index 15e633f8c8..2bbfd9b721 100644 +index 6bbb470957..307eee32c4 100644 --- a/gdb/c-lang.c +++ b/gdb/c-lang.c -@@ -184,7 +184,7 @@ c_printchar (int c, struct type *type, struct ui_file *stream) +@@ -185,7 +185,7 @@ c_printchar (int c, struct type *type, struct ui_file *stream) void c_printstr (struct ui_file *stream, struct type *type, @@ -1384,7 +1384,7 @@ index 15e633f8c8..2bbfd9b721 100644 const char *user_encoding, int force_ellipses, const struct value_print_options *options) { -@@ -666,7 +666,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp, +@@ -667,7 +667,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp, } else { @@ -1393,7 +1393,7 @@ index 15e633f8c8..2bbfd9b721 100644 /* Write the terminating character. */ for (i = 0; i < TYPE_LENGTH (type); ++i) -@@ -675,7 +675,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp, +@@ -676,7 +676,7 @@ evaluate_subexp_c (struct type *expect_type, struct expression *exp, if (satisfy_expected) { LONGEST low_bound, high_bound; @@ -1624,7 +1624,7 @@ index 579d3c8c91..9dd430b2bc 100644 struct value *val, const struct value_print_options *options) diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c -index cfca1c2751..d91d69155d 100644 +index 45814c747b..11d1231df2 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -1817,7 +1817,7 @@ rw_pieced_value (struct value *v, struct value *from) @@ -1688,10 +1688,10 @@ index cfca1c2751..d91d69155d 100644 if (subobj_byte_offset + len > max) diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index d69f154af3..420c3e6bd5 100644 +index 76884243fe..ae1c86acfe 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c -@@ -2024,12 +2024,12 @@ dwarf2_complex_location_expr_complaint (void) +@@ -2021,11 +2021,11 @@ dwarf2_complex_location_expr_complaint (void) } static void @@ -1700,15 +1700,14 @@ index d69f154af3..420c3e6bd5 100644 +dwarf2_const_value_length_mismatch_complaint (const char *arg1, LONGEST arg2, + LONGEST arg3) { - complaint (&symfile_complaints, -- _("const value length mismatch for '%s', got %d, expected %d"), +- complaint (_("const value length mismatch for '%s', got %d, expected %d"), - arg1, arg2, arg3); -+ _("const value length mismatch for '%s', got %s, expected %s"), ++ complaint (_("const value length mismatch for '%s', got %s, expected %s"), + arg1, plongest (arg2), plongest (arg3)); } static void -@@ -15004,8 +15004,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die, +@@ -14941,8 +14941,8 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die, object, and then subtract off the number of bits of the field itself. The result is the bit offset of the LSB of the field. */ @@ -1893,10 +1892,10 @@ index 8ad5e25cb2..fcd0a0cdc9 100644 /* If the register length is larger than the number of bytes remaining to copy, then only copy the appropriate bytes. */ diff --git a/gdb/frame.c b/gdb/frame.c -index 07fa2bc77d..b5a2c50ec9 100644 +index c0f6e64dfc..215034f269 100644 --- a/gdb/frame.c +++ b/gdb/frame.c -@@ -1382,7 +1382,7 @@ deprecated_frame_register_read (struct frame_info *frame, int regnum, +@@ -1398,7 +1398,7 @@ deprecated_frame_register_read (struct frame_info *frame, int regnum, int get_frame_register_bytes (struct frame_info *frame, int regnum, @@ -1905,7 +1904,7 @@ index 07fa2bc77d..b5a2c50ec9 100644 int *optimizedp, int *unavailablep) { struct gdbarch *gdbarch = get_frame_arch (frame); -@@ -1411,7 +1411,7 @@ get_frame_register_bytes (struct frame_info *frame, int regnum, +@@ -1427,7 +1427,7 @@ get_frame_register_bytes (struct frame_info *frame, int regnum, } if (len > maxsize) error (_("Bad debug information detected: " @@ -1915,10 +1914,10 @@ index 07fa2bc77d..b5a2c50ec9 100644 /* Copy the data. */ while (len > 0) diff --git a/gdb/frame.h b/gdb/frame.h -index d5800b78c2..ec70d94b58 100644 +index a6f7fd8947..eb955346d5 100644 --- a/gdb/frame.h +++ b/gdb/frame.h -@@ -601,7 +601,7 @@ extern void put_frame_register (struct frame_info *frame, int regnum, +@@ -620,7 +620,7 @@ extern void put_frame_register (struct frame_info *frame, int regnum, contents are optimized out or unavailable, set *OPTIMIZEDP, *UNAVAILABLEP accordingly. */ extern int get_frame_register_bytes (struct frame_info *frame, int regnum, @@ -1969,7 +1968,7 @@ index 7330430937..9258e61843 100755 # For most targets, a pointer on the target and its representation as an # address in GDB have the same size and "look the same". For such a diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c -index 2aa5253100..06f48d3629 100644 +index 99cd1bcb92..2a7ab244fb 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -2925,7 +2925,7 @@ floatformat_from_type (const struct type *type) @@ -2441,10 +2440,10 @@ index 46088ade53..038cd2f92c 100644 /* Returns true if ADDR is in RANGE. */ diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c -index a9f0b79076..36887b35cb 100644 +index 36831071fb..fe59c80c32 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c -@@ -622,7 +622,7 @@ mips_linux_nat_target::stopped_data_address (CORE_ADDR *paddr) +@@ -614,7 +614,7 @@ mips_linux_nat_target::stopped_data_address (CORE_ADDR *paddr) the specified region can be covered by the watch registers. */ int @@ -2665,10 +2664,10 @@ index 933dbfb6c4..e5c1b07040 100644 CORE_ADDR addr; int want_space = 0; diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c -index 1423339339..b70f168106 100644 +index eb21f91c13..9e188a0ec3 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c -@@ -1496,7 +1496,7 @@ ppc_linux_nat_target::can_use_hw_breakpoint (enum bptype type, int cnt, int ot) +@@ -1313,7 +1313,7 @@ ppc_linux_nat_target::can_use_hw_breakpoint (enum bptype type, int cnt, int ot) } int @@ -2678,10 +2677,10 @@ index 1423339339..b70f168106 100644 /* Handle sub-8-byte quantities. */ if (len <= 0) diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c -index 6d3a64c4f0..3ace6096dd 100644 +index 5716f82810..bf54f2690d 100644 --- a/gdb/ppc-linux-tdep.c +++ b/gdb/ppc-linux-tdep.c -@@ -1637,7 +1637,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep, +@@ -1705,7 +1705,7 @@ ppc_init_linux_record_tdep (struct linux_record_tdep *record_tdep, const struct floatformat ** ppc_floatformat_for_type (struct gdbarch *gdbarch, @@ -2903,10 +2902,10 @@ index d7bb8b5c93..06f878ab01 100644 diff --git a/gdb/remote.c b/gdb/remote.c -index 58ed9e4f4d..ce67d76195 100644 +index e7ade41c34..5bf085d123 100644 --- a/gdb/remote.c +++ b/gdb/remote.c -@@ -146,7 +146,7 @@ public: +@@ -455,7 +455,7 @@ public: int remove_hw_breakpoint (struct gdbarch *, struct bp_target_info *) override; @@ -2915,7 +2914,7 @@ index 58ed9e4f4d..ce67d76195 100644 int insert_watchpoint (CORE_ADDR, int, enum target_hw_bp_type, struct expression *) override; -@@ -10216,7 +10216,7 @@ int remote_hw_watchpoint_length_limit = -1; +@@ -10552,7 +10552,7 @@ int remote_hw_watchpoint_length_limit = -1; int remote_hw_breakpoint_limit = -1; int @@ -2983,7 +2982,7 @@ index 5da5e4e7fc..29db0e8ea6 100644 struct target_ops *ops_beneath = find_target_beneath (this); diff --git a/gdb/stack.c b/gdb/stack.c -index 74c92537da..10f246ecd1 100644 +index bfd9653cca..e71a44e70a 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -190,7 +190,7 @@ print_stack_frame (struct frame_info *frame, int print_level, @@ -3133,7 +3132,7 @@ index 6e13809397..aaed35f690 100644 virtual bool can_accel_watchpoint_condition (CORE_ADDR, int, int, diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c -index 369f07581f..e7bcaa293f 100644 +index d99d663895..836d4e3d5d 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -829,10 +829,10 @@ collection_list::add_register (unsigned int regno) @@ -3474,10 +3473,10 @@ index 1f62039be5..00e3cc5714 100644 int quote_char, int c_style_terminator, const struct value_print_options *options); diff --git a/gdb/value.c b/gdb/value.c -index 98c060c65f..569281dbbd 100644 +index 3e0b2ff883..33c28f2340 100644 --- a/gdb/value.c +++ b/gdb/value.c -@@ -384,7 +384,8 @@ value_bytes_available (const struct value *value, +@@ -383,7 +383,8 @@ value_bytes_available (const struct value *value, } int @@ -3487,7 +3486,7 @@ index 98c060c65f..569281dbbd 100644 { gdb_assert (!value->lazy); -@@ -832,8 +833,8 @@ find_first_range_overlap_and_match (struct ranges_and_idx *rp1, +@@ -831,8 +832,8 @@ find_first_range_overlap_and_match (struct ranges_and_idx *rp1, Return true if the available bits match. */ static bool @@ -3498,7 +3497,7 @@ index 98c060c65f..569281dbbd 100644 int length) { /* Each array element corresponds to a ranges source (unavailable, -@@ -1424,7 +1425,8 @@ value_optimized_out (struct value *value) +@@ -1423,7 +1424,8 @@ value_optimized_out (struct value *value) the following LENGTH bytes. */ void diff --git a/gdb-rhbz795424-bitpos-21of25.patch b/gdb-rhbz795424-bitpos-21of25.patch index 84f40f8..f00e764 100644 --- a/gdb-rhbz795424-bitpos-21of25.patch +++ b/gdb-rhbz795424-bitpos-21of25.patch @@ -115,7 +115,7 @@ index e5c1b07040..06fb3b77c9 100644 base_valaddr = buf.data (); diff --git a/gdb/utils.c b/gdb/utils.c -index 7813df1436..c816e2f897 100644 +index c69c01efc1..42d4225595 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -2816,6 +2816,17 @@ string_to_core_addr (const char *my_string) @@ -149,10 +149,10 @@ index 96b922dbef..a7f9be5f4e 100644 address = value_address (*arg1p); diff --git a/gdb/value.c b/gdb/value.c -index 569281dbbd..1964cf771c 100644 +index 33c28f2340..f1a98a8556 100644 --- a/gdb/value.c +++ b/gdb/value.c -@@ -934,6 +934,7 @@ allocate_value_lazy (struct type *type) +@@ -933,6 +933,7 @@ allocate_value_lazy (struct type *type) description correctly. */ check_typedef (type); @@ -160,7 +160,7 @@ index 569281dbbd..1964cf771c 100644 val = new struct value (type); /* Values start out on the all_values chain. */ -@@ -1016,6 +1017,8 @@ check_type_length_before_alloc (const struct type *type) +@@ -1015,6 +1016,8 @@ check_type_length_before_alloc (const struct type *type) static void allocate_value_contents (struct value *val) { @@ -169,7 +169,7 @@ index 569281dbbd..1964cf771c 100644 if (!val->contents) { check_type_length_before_alloc (val->enclosing_type); -@@ -2877,6 +2880,7 @@ set_value_enclosing_type (struct value *val, struct type *new_encl_type) +@@ -2876,6 +2879,7 @@ set_value_enclosing_type (struct value *val, struct type *new_encl_type) if (TYPE_LENGTH (new_encl_type) > TYPE_LENGTH (value_enclosing_type (val))) { check_type_length_before_alloc (new_encl_type); diff --git a/gdb-rhbz795424-bitpos-22of25.patch b/gdb-rhbz795424-bitpos-22of25.patch index 1f4d982..3592faa 100644 --- a/gdb-rhbz795424-bitpos-22of25.patch +++ b/gdb-rhbz795424-bitpos-22of25.patch @@ -282,7 +282,7 @@ index 1940b06a89..79504a4640 100644 #endif /* AARCH64_LINUX_HW_POINT_H */ diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c -index b70f168106..a712197618 100644 +index 9e188a0ec3..f08a964983 100644 --- a/gdb/ppc-linux-nat.c +++ b/gdb/ppc-linux-nat.c @@ -282,7 +282,7 @@ struct ppc_linux_nat_target final : public linux_nat_target @@ -306,7 +306,7 @@ index b70f168106..a712197618 100644 override; int masked_watch_num_registers (CORE_ADDR, CORE_ADDR) override; -@@ -1847,11 +1847,11 @@ can_use_watchpoint_cond_accel (void) +@@ -1664,11 +1664,11 @@ can_use_watchpoint_cond_accel (void) CONDITION_VALUE will hold the value which should be put in the DVC register. */ static void @@ -321,7 +321,7 @@ index b70f168106..a712197618 100644 CORE_ADDR addr_end_data, addr_end_dvc; /* The DVC register compares bytes within fixed-length windows which -@@ -1939,7 +1939,7 @@ num_memory_accesses (const std::vector &chain) +@@ -1756,7 +1756,7 @@ num_memory_accesses (const std::vector &chain) of the constant. */ static int check_condition (CORE_ADDR watch_addr, struct expression *cond, @@ -330,7 +330,7 @@ index b70f168106..a712197618 100644 { int pc = 1, num_accesses_left, num_accesses_right; struct value *left_val, *right_val; -@@ -1990,7 +1990,8 @@ check_condition (CORE_ADDR watch_addr, struct expression *cond, +@@ -1807,7 +1807,8 @@ check_condition (CORE_ADDR watch_addr, struct expression *cond, the condition expression, thus only triggering the watchpoint when it is true. */ bool @@ -340,7 +340,7 @@ index b70f168106..a712197618 100644 int rw, struct expression *cond) { -@@ -2008,7 +2009,7 @@ ppc_linux_nat_target::can_accel_watchpoint_condition (CORE_ADDR addr, int len, +@@ -1825,7 +1826,7 @@ ppc_linux_nat_target::can_accel_watchpoint_condition (CORE_ADDR addr, int len, static void create_watchpoint_request (struct ppc_hw_breakpoint *p, CORE_ADDR addr, @@ -349,7 +349,7 @@ index b70f168106..a712197618 100644 struct expression *cond, int insert) { if (len == 1 -@@ -2274,7 +2275,7 @@ ppc_linux_nat_target::stopped_by_watchpoint () +@@ -2091,7 +2092,7 @@ ppc_linux_nat_target::stopped_by_watchpoint () bool ppc_linux_nat_target::watchpoint_addr_within_range (CORE_ADDR addr, CORE_ADDR start, @@ -381,10 +381,10 @@ index ca7cc221f9..717a1130fe 100644 { int pflags = 0; diff --git a/gdb/remote.c b/gdb/remote.c -index ce67d76195..635cb266e8 100644 +index 5bf085d123..9eed75aa8c 100644 --- a/gdb/remote.c +++ b/gdb/remote.c -@@ -138,7 +138,7 @@ public: +@@ -447,7 +447,7 @@ public: bool stopped_data_address (CORE_ADDR *) override; @@ -393,7 +393,7 @@ index ce67d76195..635cb266e8 100644 int can_use_hw_breakpoint (enum bptype, int, int) override; -@@ -10145,7 +10145,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len, +@@ -10481,7 +10481,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len, p = strchr (rs->buf, '\0'); addr = remote_address_masked (addr); p += hexnumstr (p, (ULONGEST) addr); @@ -402,7 +402,7 @@ index ce67d76195..635cb266e8 100644 putpkt (rs->buf); getpkt (&rs->buf, &rs->buf_size, 0); -@@ -10165,7 +10165,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len, +@@ -10501,7 +10501,7 @@ remote_target::insert_watchpoint (CORE_ADDR addr, int len, bool remote_target::watchpoint_addr_within_range (CORE_ADDR addr, @@ -411,7 +411,7 @@ index ce67d76195..635cb266e8 100644 { CORE_ADDR diff = remote_address_masked (addr - start); -@@ -10194,7 +10194,7 @@ remote_target::remove_watchpoint (CORE_ADDR addr, int len, +@@ -10530,7 +10530,7 @@ remote_target::remove_watchpoint (CORE_ADDR addr, int len, p = strchr (rs->buf, '\0'); addr = remote_address_masked (addr); p += hexnumstr (p, (ULONGEST) addr); diff --git a/gdb-rhbz795424-bitpos-23of25.patch b/gdb-rhbz795424-bitpos-23of25.patch index 4bd2010..23628ed 100644 --- a/gdb-rhbz795424-bitpos-23of25.patch +++ b/gdb-rhbz795424-bitpos-23of25.patch @@ -886,10 +886,10 @@ index af6a089608..be10f0a3c0 100644 sp -= container_len; write_memory (rl78_make_data_address (sp), diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c -index e3e086c210..76f553bebf 100644 +index ecf6191df0..acf2473018 100644 --- a/gdb/rs6000-aix-tdep.c +++ b/gdb/rs6000-aix-tdep.c -@@ -187,9 +187,9 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function, +@@ -177,9 +177,9 @@ rs6000_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); int ii; @@ -901,7 +901,7 @@ index e3e086c210..76f553bebf 100644 gdb_byte tmp_buffer[50]; int f_argno = 0; /* current floating point argno */ int wordsize = gdbarch_tdep (gdbarch)->wordsize; -@@ -319,7 +319,7 @@ ran_out_of_registers_for_arguments: +@@ -309,7 +309,7 @@ ran_out_of_registers_for_arguments: if ((argno < nargs) || argbytes) { diff --git a/gdb-vla-intel-fortran-strides.patch b/gdb-vla-intel-fortran-strides.patch index 0f5cbcf..43e5bcf 100644 --- a/gdb-vla-intel-fortran-strides.patch +++ b/gdb-vla-intel-fortran-strides.patch @@ -37,7 +37,7 @@ dbfd7140bf4c0500d1f5d192be781f83f78f7922 23 files changed, 1242 insertions(+), 183 deletions(-) diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c -index 6ecc5a9be6..fa9ff30721 100644 +index 730934fe6e..e1dd28e7e7 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -2600,11 +2600,14 @@ dwarf2_locexpr_baton_eval (const struct dwarf2_locexpr_baton *dlbaton, @@ -145,10 +145,10 @@ index f82e7b2d11..74f0597359 100644 property to C code. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 49ce83ff20..a28d0a029e 100644 +index 834bce776a..464dff0d2b 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c -@@ -17635,7 +17635,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17552,7 +17552,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) struct type *base_type, *orig_base_type; struct type *range_type; struct attribute *attr; @@ -157,7 +157,7 @@ index 49ce83ff20..a28d0a029e 100644 int low_default_is_valid; int high_bound_is_count = 0; const char *name; -@@ -17655,7 +17655,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17572,7 +17572,9 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) low.kind = PROP_CONST; high.kind = PROP_CONST; @@ -167,22 +167,22 @@ index 49ce83ff20..a28d0a029e 100644 /* Set LOW_DEFAULT_IS_VALID if current language and DWARF version allow omitting DW_AT_lower_bound. */ -@@ -17688,6 +17690,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17605,6 +17607,14 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) break; } + attr = dwarf2_attr (die, DW_AT_byte_stride, cu); + if (attr) + if (!attr_to_dynamic_prop (attr, die, cu, &stride)) -+ complaint (&symfile_complaints, _("Missing DW_AT_byte_stride " -+ "- DIE at 0x%s [in module %s]"), ++ complaint (_("Missing DW_AT_byte_stride " ++ "- DIE at 0x%s [in module %s]"), + sect_offset_str (die->sect_off), + objfile_name (cu->per_cu->dwarf2_per_objfile->objfile)); + attr = dwarf2_attr (die, DW_AT_lower_bound, cu); if (attr) attr_to_dynamic_prop (attr, die, cu, &low); -@@ -17765,7 +17775,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17682,7 +17692,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) && !TYPE_UNSIGNED (base_type) && (high.data.const_val & negative_mask)) high.data.const_val |= negative_mask; @@ -840,7 +840,7 @@ index 903f2af638..b4067a8460 100644 for (i = lowerbound; (i < upperbound + 1 && (*elts) < options->print_max); diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c -index 6d70006081..64711e8cfb 100644 +index 4f77a5214e..98d3260860 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -902,7 +902,8 @@ operator== (const range_bounds &l, const range_bounds &r) diff --git a/gdb-vla-intel-fortran-vla-strings.patch b/gdb-vla-intel-fortran-vla-strings.patch index 4d2a16a..eebed08 100644 --- a/gdb-vla-intel-fortran-vla-strings.patch +++ b/gdb-vla-intel-fortran-vla-strings.patch @@ -79,7 +79,7 @@ index c4c0918e26..3904fab260 100644 type_print (value_type (val), "", stream, -1); fprintf_filtered (stream, ") "); diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index a28d0a029e..4006f4a48f 100644 +index 464dff0d2b..7fe15e5d05 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -1789,7 +1789,8 @@ static void read_signatured_type (struct signatured_type *); @@ -92,7 +92,7 @@ index a28d0a029e..4006f4a48f 100644 /* memory allocation interface */ -@@ -13681,7 +13682,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) +@@ -13640,7 +13641,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu) { newobj->static_link = XOBNEW (&objfile->objfile_obstack, struct dynamic_prop); @@ -101,7 +101,7 @@ index a28d0a029e..4006f4a48f 100644 } cu->list_in_scope = &local_symbols; -@@ -16385,7 +16386,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -16311,7 +16312,8 @@ read_array_type (struct die_info *die, struct dwarf2_cu *cu) byte_stride_prop = (struct dynamic_prop *) alloca (sizeof (struct dynamic_prop)); @@ -110,8 +110,8 @@ index a28d0a029e..4006f4a48f 100644 + NULL, 0); if (!stride_ok) { - complaint (&symfile_complaints, -@@ -17156,29 +17158,94 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu) + complaint (_("unable to read array DW_AT_byte_stride " +@@ -17076,29 +17078,90 @@ read_tag_string_type (struct die_info *die, struct dwarf2_cu *cu) struct gdbarch *gdbarch = get_objfile_arch (objfile); struct type *type, *range_type, *index_type, *char_type; struct attribute *attr; @@ -137,8 +137,7 @@ index a28d0a029e..4006f4a48f 100644 + /* DW_AT_byte_size should never occur in combination with + DW_AT_bit_size. */ + if (byte_size != NULL && bit_size != NULL) -+ complaint (&symfile_complaints, -+ _("DW_AT_byte_size AND " ++ complaint (_("DW_AT_byte_size AND " + "DW_AT_bit_size found together at the same time.")); + + /* If DW_AT_string_length AND DW_AT_byte_size exist together, @@ -160,12 +159,10 @@ index a28d0a029e..4006f4a48f 100644 + + if (!attr_to_dynamic_prop (attr, die, cu, &high, append_ops, + ARRAY_SIZE(append_ops))) -+ complaint (&symfile_complaints, -+ _("Could not parse DW_AT_byte_size")); ++ complaint (_("Could not parse DW_AT_byte_size")); + } + else if (bit_size != NULL) -+ complaint (&symfile_complaints, -+ _("DW_AT_string_length AND " ++ complaint (_("DW_AT_string_length AND " + "DW_AT_bit_size found but not supported yet.")); + /* If DW_AT_string_length WITHOUT DW_AT_byte_size exist, the default + is the address size of the target machine. */ @@ -176,8 +173,7 @@ index a28d0a029e..4006f4a48f 100644 + + if (!attr_to_dynamic_prop (attr, die, cu, &high, append_ops, + ARRAY_SIZE(append_ops))) -+ complaint (&symfile_complaints, -+ _("Could not parse DW_AT_string_length")); ++ complaint (_("Could not parse DW_AT_string_length")); + } + + TYPE_RANGE_DATA (range_type)->high = high; @@ -217,7 +213,7 @@ index a28d0a029e..4006f4a48f 100644 char_type = language_string_char_type (cu->language_defn, gdbarch); type = create_string_type (NULL, char_type, range_type); -@@ -17529,7 +17596,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17446,7 +17509,8 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu) static int attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die, @@ -227,7 +223,7 @@ index a28d0a029e..4006f4a48f 100644 { struct dwarf2_property_baton *baton; struct obstack *obstack -@@ -17540,14 +17608,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die, +@@ -17457,14 +17521,33 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die, if (attr_form_is_block (attr)) { @@ -265,7 +261,7 @@ index a28d0a029e..4006f4a48f 100644 } else if (attr_form_is_ref (attr)) { -@@ -17580,8 +17667,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die, +@@ -17497,8 +17580,28 @@ attr_to_dynamic_prop (const struct attribute *attr, struct die_info *die, baton = XOBNEW (obstack, struct dwarf2_property_baton); baton->referenced_type = die_type (target_die, target_cu); baton->locexpr.per_cu = cu->per_cu; @@ -296,25 +292,25 @@ index a28d0a029e..4006f4a48f 100644 prop->data.baton = baton; prop->kind = PROP_LOCEXPR; gdb_assert (prop->data.baton != NULL); -@@ -17692,7 +17799,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17609,7 +17712,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) attr = dwarf2_attr (die, DW_AT_byte_stride, cu); if (attr) - if (!attr_to_dynamic_prop (attr, die, cu, &stride)) + if (!attr_to_dynamic_prop (attr, die, cu, &stride, NULL, 0)) - complaint (&symfile_complaints, _("Missing DW_AT_byte_stride " - "- DIE at 0x%s [in module %s]"), + complaint (_("Missing DW_AT_byte_stride " + "- DIE at 0x%s [in module %s]"), sect_offset_str (die->sect_off), -@@ -17700,7 +17807,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17617,7 +17720,7 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) attr = dwarf2_attr (die, DW_AT_lower_bound, cu); if (attr) - attr_to_dynamic_prop (attr, die, cu, &low); + attr_to_dynamic_prop (attr, die, cu, &low, NULL, 0); else if (!low_default_is_valid) - complaint (&symfile_complaints, _("Missing DW_AT_lower_bound " + complaint (_("Missing DW_AT_lower_bound " "- DIE at %s [in module %s]"), -@@ -17708,10 +17815,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) +@@ -17625,10 +17728,10 @@ read_subrange_type (struct die_info *die, struct dwarf2_cu *cu) objfile_name (cu->per_cu->dwarf2_per_objfile->objfile)); attr = dwarf2_attr (die, DW_AT_upper_bound, cu); @@ -327,7 +323,7 @@ index a28d0a029e..4006f4a48f 100644 { /* If bounds are constant do the final calculation here. */ if (low.kind == PROP_CONST && high.kind == PROP_CONST) -@@ -25255,7 +25362,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu) +@@ -25129,7 +25232,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu) attr = dwarf2_attr (die, DW_AT_allocated, cu); if (attr_form_is_block (attr)) { @@ -336,7 +332,7 @@ index a28d0a029e..4006f4a48f 100644 add_dyn_prop (DYN_PROP_ALLOCATED, prop, type); } else if (attr != NULL) -@@ -25270,7 +25377,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu) +@@ -25143,7 +25246,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu) attr = dwarf2_attr (die, DW_AT_associated, cu); if (attr_form_is_block (attr)) { @@ -345,7 +341,7 @@ index a28d0a029e..4006f4a48f 100644 add_dyn_prop (DYN_PROP_ASSOCIATED, prop, type); } else if (attr != NULL) -@@ -25283,7 +25390,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu) +@@ -25155,7 +25258,7 @@ set_die_type (struct die_info *die, struct type *type, struct dwarf2_cu *cu) /* Read DW_AT_data_location and set in type. */ attr = dwarf2_attr (die, DW_AT_data_location, cu); @@ -508,7 +504,7 @@ index f14f1811f4..4f6a0ed09a 100644 } fprintfi_filtered (level, stream, "End Type "); diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c -index 64711e8cfb..2aa5253100 100644 +index 98d3260860..99cd1bcb92 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1919,7 +1919,8 @@ is_dynamic_type_internal (struct type *type, int top_level) diff --git a/gdb-vla-intel-stringbt-fix.patch b/gdb-vla-intel-stringbt-fix.patch index 78e1d87..b9fe0e2 100644 --- a/gdb-vla-intel-stringbt-fix.patch +++ b/gdb-vla-intel-stringbt-fix.patch @@ -31,7 +31,7 @@ Thanks, Jan diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c -index fa9ff30721..cfca1c2751 100644 +index e1dd28e7e7..45814c747b 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -42,6 +42,7 @@ diff --git a/gdb.spec b/gdb.spec index 8a0c0bb..b8b0d8c 100644 --- a/gdb.spec +++ b/gdb.spec @@ -18,7 +18,7 @@ Name: %{?scl_prefix}gdb # Freeze it when GDB gets branched -%global snapsrc 20180522 +%global snapsrc 20180529 # See timestamp of source gnulib installed into gdb/gnulib/ . %global snapgnulib 20161115 %global tarname gdb-%{version} @@ -26,7 +26,7 @@ Version: 8.1.50.%{snapsrc} # The release always contains a leading reserved number, start it at 1. # `upstream' is not a part of `name' to stay fully rpm dependencies compatible for the testing. -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL Group: Development/Debuggers @@ -1026,6 +1026,9 @@ then fi %changelog +* Sat Jun 2 2018 Sergio Durigan Junior - 8.1.50.20180522-16.fc29 +- Rebase to FSF GDB 8.1.50.20180529 (8.2pre). + * Wed May 30 2018 Sergio Durigan Junior - 8.1.50.20180522-15.fc28 - Rebase to FSF GDB 8.1.50.20180522 (8.2pre). diff --git a/sources b/sources index 37748c2..68212fa 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (gdb-libstdc++-v3-python-7.1.1-20170526.tar.xz) = 3d540b99581ffa4cf2810bec979c9a01a1f8ce782b7c8efb46b40dd2421d60cdb0e52b53c5477c3e86a57957a2a14489f5c29dc53868738a1ef79e79cf76d0a1 SHA512 (v1.6.1.tar.gz) = c7c9c8ba78021fff3fde12a216f5729c6031114e5a727f49b7ff1a31c53b5ddba24d1b3aee252d8278ecd1fafe78a44ed059c12b9eb29eca33093e0720673468 -SHA512 (gdb-8.1.50.20180522.tar.xz) = 27a6b106cc1f21a74acf31be45d623115a18818a9f5008ac7748dbe745685f41f055fe8acf736ee5f0d6716d47b2a4307197db8899a3a4e220bed72b1e126d97 +SHA512 (gdb-8.1.50.20180529.tar.xz) = 93e2272eacf890c5ad99f7a04f8e24df8300a064730781adadcc65441e8a73fb1668d962628d3cbc10e6c91d8efe1bda211aa83ebd135667c502369339a963a7