libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust nios2 and m68k semihosting for sys/stat.h changes. 

Commit 72ff9acad2 caused st_atime,
st_ctime, and st_mtime to be defined as macros.  This collided with
use of these identifiers as field names in struct gdb_stat (which
represents the GDB RSP encoding of struct stat) in libgloss
semihosting support for nios2 and m68k.  This patch renames the
affected fields of struct gdb_stat.

Signed-off-by: Sandra Loosemore <sandra@codesourcery.com>
This commit is contained in:
Sandra Loosemore 2019-09-03 09:35:18 -06:00 committed by Corinna Vinschen
parent 7630c77026
commit fa29288ef1
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgloss/m68k/io-gdb.c
View File

@ -94,9 +94,9 @@ __hosted_from_gdb_stat (const struct gdb_stat *gs,
s->st_size = gs->st_size; s->st_size = gs->st_size;
s->st_blksize = gs->st_blksize; s->st_blksize = gs->st_blksize;
s->st_blocks = gs->st_blocks; s->st_blocks = gs->st_blocks;
s->st_atime = gs->st_atime; s->st_atime = gs->st_atim;
s->st_mtime = gs->st_mtime; s->st_mtime = gs->st_mtim;
s->st_ctime = gs->st_ctime; s->st_ctime = gs->st_ctim;
} }
void void

6
libgloss/m68k/io.h
View File

@ -58,9 +58,9 @@ struct gdb_stat {
uint64_t st_size; /* total size, in bytes */ uint64_t st_size; /* total size, in bytes */
uint64_t st_blksize; /* blocksize for filesystem I/O */ uint64_t st_blksize; /* blocksize for filesystem I/O */
uint64_t st_blocks; /* number of blocks allocated */ uint64_t st_blocks; /* number of blocks allocated */
gdb_time_t st_atime; /* time of last access */ gdb_time_t st_atim; /* time of last access */
gdb_time_t st_mtime; /* time of last modification */ gdb_time_t st_mtim; /* time of last modification */
gdb_time_t st_ctime; /* time of last change */ gdb_time_t st_ctim; /* time of last change */
}; };
struct gdb_timeval { struct gdb_timeval {

6
libgloss/nios2/io-gdb.c
View File

@ -106,9 +106,9 @@ __hosted_from_gdb_stat (const struct gdb_stat *gs,
s->st_size = SWAP64 (gs->st_size); s->st_size = SWAP64 (gs->st_size);
s->st_blksize = SWAP64 (gs->st_blksize); s->st_blksize = SWAP64 (gs->st_blksize);
s->st_blocks = SWAP64 (gs->st_blocks); s->st_blocks = SWAP64 (gs->st_blocks);
s->st_atime = SWAP32 (gs->st_atime); s->st_atime = SWAP32 (gs->st_atim);
s->st_mtime = SWAP32 (gs->st_mtime); s->st_mtime = SWAP32 (gs->st_mtim);
s->st_ctime = SWAP32 (gs->st_ctime); s->st_ctime = SWAP32 (gs->st_ctim);
} }
void void

6
libgloss/nios2/io.h
View File

@ -57,9 +57,9 @@ struct gdb_stat {
uint64_t st_size; /* total size, in bytes */ uint64_t st_size; /* total size, in bytes */
uint64_t st_blksize; /* blocksize for filesystem I/O */ uint64_t st_blksize; /* blocksize for filesystem I/O */
uint64_t st_blocks; /* number of blocks allocated */ uint64_t st_blocks; /* number of blocks allocated */
gdb_time_t st_atime; /* time of last access */ gdb_time_t st_atim; /* time of last access */
gdb_time_t st_mtime; /* time of last modification */ gdb_time_t st_mtim; /* time of last modification */
gdb_time_t st_ctime; /* time of last change */ gdb_time_t st_ctim; /* time of last change */
}; };
struct gdb_timeval { struct gdb_timeval {