Commit Message
procfs.c currently doesn't compile on Solaris:
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c: In member function ‘virtual target_xfer_status procfs_target::xfer_partial(target_object, const char*, gdb_byte*, const gdb_byte*, ULONGEST, ULONGEST, ULONGEST*)’:
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c:2577:20: error: invalid use of member function ‘target_ops* target_ops::beneath() const’ (did you forget the ‘()’ ?)
return this->beneath->xfer_partial (object, annex,
~~~~~~^~~~~~~
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c:2577:27: error: base operand of ‘->’ is not a pointer
return this->beneath->xfer_partial (object, annex,
^~
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c: In function ‘void _initialize_procfs()’:
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c:3734:15: error: invalid initialization of reference of type ‘const target_info&’ from expression of type ‘procfs_target*’
add_target (&the_procfs_target);
^~~~~~~~~~~~~~~~~~
In file included from /vol/src/gnu/gdb/gdb/local/gdb/inferior.h:40,
from /vol/src/gnu/gdb/gdb/local/gdb/procfs.c:24:
/vol/src/gnu/gdb/gdb/local/gdb/target.h:2305:13: note: in passing argument 1 of ‘void add_target(const target_info&, void (*)(const char*, int), void (*)(cmd_list_element*, completion_tracker&, const char*, const char*))’
extern void add_target (const target_info &info,
^~~~~~~~~~
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c: In member function ‘virtual char* procfs_target::make_corefile_notes(bfd*, int*)’:
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c:3898:16: error: too many arguments to function ‘gdb::optional<std::vector<unsigned char, gdb::default_init_allocator<unsigned char, std::allocator<unsigned char> > > > target_read_alloc(target_ops*, target_object, const char*)’
NULL, &auxv);
^
In file included from /vol/src/gnu/gdb/gdb/local/gdb/inferior.h:40,
from /vol/src/gnu/gdb/gdb/local/gdb/procfs.c:24:
/vol/src/gnu/gdb/gdb/local/gdb/target.h:341:40: note: declared here
extern gdb::optional<gdb::byte_vector> target_read_alloc
^~~~~~~~~~~~~~~~~
/vol/src/gnu/gdb/gdb/local/gdb/procfs.c:3898:16: error: cannot convert ‘gdb::optional<std::vector<unsigned char, gdb::default_init_allocator<unsigned char, std::allocator<unsigned char> > > >’ to ‘int’ in assignment
NULL, &auxv);
^
Fixed as follows. Built and ran make check on 64-bit Solaris 11.5/x86
(amd64-pc-solaris2.11) only.
Ok for mainline?
The fix is mostly based on pattern matching in other similar files,
given that my command of C++ is close to non-existant. Evaluating make
check results is hard, too, given that the Solaris results are
relatively bad even on the 8.1 branch. Here's the summary for mainline
=== gdb Summary ===
# of expected passes 42711
# of unexpected failures 2639
# of unexpected successes 12
# of expected failures 42
# of unknown successes 3
# of known failures 61
# of unresolved testcases 29
# of untested testcases 95
# of unsupported tests 183
When looking into fails new from the top of the 8.1 branch, nothing
really stuck out (at least to me).
Comments
On 06/08/2018 01:04 PM, Rainer Orth wrote:
> Fixed as follows. Built and ran make check on 64-bit Solaris 11.5/x86
> (amd64-pc-solaris2.11) only.
>
> Ok for mainline?
OK.
Thanks,
Pedro Alves
# HG changeset patch
# Parent 771dfa359ac98211d3f85ce89d13933d549881b2
Fix procfs.c compilation
@@ -2574,7 +2574,7 @@ procfs_target::xfer_partial (enum target
offset, len, xfered_len);
default:
- return this->beneath->xfer_partial (object, annex,
+ return this->beneath ()->xfer_partial (object, annex,
readbuf, writebuf, offset, len,
xfered_len);
}
@@ -3731,7 +3731,7 @@ void
add_com ("proc-untrace-exit", no_class, proc_untrace_sysexit_cmd,
_("Cancel a trace of exits from the syscall."));
- add_target (&the_procfs_target);
+ add_inf_child_target (&the_procfs_target);
}
/* =================== END, GDB "MODULE" =================== */
@@ -3851,8 +3851,6 @@ procfs_target::make_corefile_notes (bfd
char *note_data = NULL;
char *inf_args;
struct procfs_corefile_thread_data thread_args;
- gdb_byte *auxv;
- int auxv_len;
enum gdb_signal stop_signal;
if (get_exec_file (0))
@@ -3894,14 +3892,12 @@ procfs_target::make_corefile_notes (bfd
&thread_args);
note_data = thread_args.note_data;
- auxv_len = target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV,
- NULL, &auxv);
- if (auxv_len > 0)
- {
- note_data = elfcore_write_note (obfd, note_data, note_size,
- "CORE", NT_AUXV, auxv, auxv_len);
- xfree (auxv);
- }
+ gdb::optional<gdb::byte_vector> auxv =
+ target_read_alloc (current_top_target (), TARGET_OBJECT_AUXV, NULL);
+ if (auxv && !auxv->empty ())
+ note_data = elfcore_write_note (obfd, note_data, note_size,
+ "CORE", NT_AUXV, auxv->data (),
+ auxv->size ());
return note_data;
}