Fix build errors for armhf

When building for 32-bit ARM, I ran into a couple build failures.

The first one seems to be caused by recent changes to warning switches,
leading to the following error:

--
In file included from gdb/coffread.c:35:0:
gdb/coffread.c: In function  "void enter_linenos(file_ptr, int, int, objfile*)":
gdb/complaints.h:40:40: error: format "%ld" expects argument of type "long int", but argument 2 has type "file_ptr {aka long long int}" [-Werror=format=]
  complaint_internal (FMT, ##__VA_ARGS__);  \
                                        ^
gdb/coffread.c:1413:7: note: in expansion of macro "complaint"
       complaint (_("Line number pointer %ld lower than start of line numbers"),
       ^~~~~~~~~
--

The other one is due to a narrowing conversion in valops.c:

--
gdb/valops.c: In function "value* value_assign(value*, value*)":
gdb/gdbtypes.h:1798:43: error: narrowing conversion of "type->type::length" from "ULONGEST {aka long long unsigned int}" to "size_t {aka unsigned int}" inside { } [-Werror=narrowing]
 #define TYPE_LENGTH(thistype) (thistype)->length
                               ~~~~~~~~~~~~^
gdb/valops.c:1252:9: note: in expansion of macro "TYPE_LENGTH"
         TYPE_LENGTH (type)});
--

Fix both with the following patch. Validated with --enable-targets=all on
Ubuntu 18.04/20.04.

gdb/ChangeLog:

2021-01-21  Luis Machado  <luis.machado@linaro.org>

	* coffread.c (enter_linenos): Passing string to complaint.
	* valops.c (value_assign): Make array view.
This commit is contained in:
Luis Machado 2021-01-21 10:27:12 -03:00
parent a59902a7c1
commit d5d24e12f9
3 changed files with 11 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2021-01-21 Luis Machado <luis.machado@linaro.org>
* coffread.c (enter_linenos): Passing string to complaint.
* valops.c (value_assign): Make array view.
2021-01-21 Simon Marchi <simon.marchi@polymtl.ca> 2021-01-21 Simon Marchi <simon.marchi@polymtl.ca>
* auto-load.h (debug_auto_load): Move here. * auto-load.h (debug_auto_load): Move here.

View file

@ -1410,8 +1410,8 @@ enter_linenos (file_ptr file_offset, int first_line,
return; return;
if (file_offset < linetab_offset) if (file_offset < linetab_offset)
{ {
complaint (_("Line number pointer %ld lower than start of line numbers"), complaint (_("Line number pointer %s lower than start of line numbers"),
file_offset); plongest (file_offset));
if (file_offset > linetab_size) /* Too big to be an offset? */ if (file_offset > linetab_size) /* Too big to be an offset? */
return; return;
file_offset += linetab_offset; /* Try reading at that linetab file_offset += linetab_offset; /* Try reading at that linetab

View file

@ -1246,10 +1246,12 @@ value_assign (struct value *toval, struct value *fromval)
} }
else else
{ {
gdb::array_view<const gdb_byte> contents
= gdb::make_array_view (value_contents (fromval),
TYPE_LENGTH (type));
put_frame_register_bytes (frame, value_reg, put_frame_register_bytes (frame, value_reg,
value_offset (toval), value_offset (toval),
{value_contents (fromval), contents);
TYPE_LENGTH (type)});
} }
} }