diff options
| author | Joel Brobecker <brobecker@adacore.com> | 2014-12-03 02:33:13 -0500 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2014-12-03 13:43:08 +0400 |
| commit | 2d7bb7580ac174127f8ae127ebc4156a91035fc0 (patch) | |
| tree | b2bda134fce35d42ba03bd5377f2f2138ae27dc1 /sim/cris | |
| parent | fd9edc908915788839e7605e2fe4c00f4b3eb3db (diff) | |
| download | gdb-2d7bb7580ac174127f8ae127ebc4156a91035fc0.zip gdb-2d7bb7580ac174127f8ae127ebc4156a91035fc0.tar.gz gdb-2d7bb7580ac174127f8ae127ebc4156a91035fc0.tar.bz2 | |
callback.h:struct host_callback_struct compilation error on Windows hosts.
On Windows, a recent gnulib update imported the lstat module, and
this caused a remote-sim.c build failure in struct host_callback_struct:
In file included from /[...]/gdb/remote-sim.c:34:0:
/[...]/gdb/../include/gdb/callback.h:93:9: error: duplicate member '_stati64'
int (*lstat) (host_callback *, const char *, struct stat *);
^
What happens it that gnulib's stat.h makes the following defines:
/* Large File Support on native Windows. */
#if 1
# define stat _stati64
#endif
and then:
#if 1
# if ! 0
/* mingw does not support symlinks, therefore it does not have lstat. But
without links, stat does just fine. */
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# define lstat stat
# endif
So, the following fields in struct host_callback_struct...
int (*stat) (host_callback *, const char *, struct stat *);
int (*fstat) (host_callback *, int, struct stat *);
int (*lstat) (host_callback *, const char *, struct stat *);
... get translated to...
int (*_stati64) (host_callback *, const char *, struct _stati64 *);
int (*_fstati64) (host_callback *, int, struct _stati64 *);
int (*_stati64) (host_callback *, const char *, struct _stati64 *);
... which causes two fields to have the same name.
This patch fixes the issue by renaming the stat-related fields
by adding a "to_" prefix, similar to what is done in GDB's
target_ops vector.
include/gdb/ChangeLog:
* callback.h (struct host_callback_struct) <to_stat>: Renamed
from "stat".
<to_fstat>: Renamed from "fstat".
<to_lstat>: Renamed from "lstat".
sim/common/ChangeLog:
* sim-io.c (sim_io_stat, sim_io_fstat): Adjust calls to "stat"
and "fstat" callbacks by calls to "to_stat" and "to_fstat" (resp)
callbacks following renaming in callback.h.
* syscall.c (cb_syscall): Likewise. Adjust calls to "lstat"
callback by call to "to_lstat" callback
sim/cris/ChangeLog:
* traps.c (cris_break_13_handler): Adjust call to "fstat" callback
by call to "to_fstat" following renaming in callback.h.
sim/h8300/ChangeLog:
* compile.c (sim_resume): Adjust calls to "stat" and "fstat"
callbacks by calls to "to_stat" and "to_fstat" (resp) callbacks
following renaming in callback.h.
Diffstat (limited to 'sim/cris')
| -rw-r--r-- | sim/cris/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/cris/traps.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sim/cris/ChangeLog b/sim/cris/ChangeLog index 4801f14..ad903fb 100644 --- a/sim/cris/ChangeLog +++ b/sim/cris/ChangeLog @@ -1,3 +1,8 @@ +2014-12-03 Joel Brobecker <brobecker@adacore.com> + + * traps.c (cris_break_13_handler): Adjust call to "fstat" callback + by call to "to_fstat" following renaming in callback.h. + 2014-08-19 Alan Modra <amodra@gmail.com> * configure: Regenerate. diff --git a/sim/cris/traps.c b/sim/cris/traps.c index 35dce3c..c50f04f 100644 --- a/sim/cris/traps.c +++ b/sim/cris/traps.c @@ -2204,7 +2204,7 @@ cris_break_13_handler (SIM_CPU *current_cpu, USI callnum, USI arg1, || ((events = sim_core_read_unaligned_2 (current_cpu, pc, 0, ufds + 4)) != TARGET_POLLIN) - || ((cb->fstat) (cb, fd, &buf) != 0 + || ((cb->to_fstat) (cb, fd, &buf) != 0 || (buf.st_mode & S_IFIFO) == 0) || current_cpu->thread_data == NULL) { |