Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandra Loosemore <sandra@codesourcery.com>2019-09-03 18:35:18 +0300
committerCorinna Vinschen <corinna@vinschen.de>2019-09-04 10:44:35 +0300
commitfa29288ef162250ce67499832ca0f471b2a1c949 (patch)
treed74f1cd49f206a3aafdf299344d48e61c75cb868 /libgloss/nios2
parent7630c77026da1c98a0c77f50ad3fbd4589a7a260 (diff)
Adjust nios2 and m68k semihosting for sys/stat.h changes.
Commit 72ff9acad2ab54e80a19ddaec0106065c817e3f6 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>
Diffstat (limited to 'libgloss/nios2')
-rw-r--r--libgloss/nios2/io-gdb.c6
-rw-r--r--libgloss/nios2/io.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/libgloss/nios2/io-gdb.c b/libgloss/nios2/io-gdb.c
index ee585595a..48a5be603 100644
--- a/libgloss/nios2/io-gdb.c
+++ b/libgloss/nios2/io-gdb.c
@@ -106,9 +106,9 @@ __hosted_from_gdb_stat (const struct gdb_stat *gs,
s->st_size = SWAP64 (gs->st_size);
s->st_blksize = SWAP64 (gs->st_blksize);
s->st_blocks = SWAP64 (gs->st_blocks);
- s->st_atime = SWAP32 (gs->st_atime);
- s->st_mtime = SWAP32 (gs->st_mtime);
- s->st_ctime = SWAP32 (gs->st_ctime);
+ s->st_atime = SWAP32 (gs->st_atim);
+ s->st_mtime = SWAP32 (gs->st_mtim);
+ s->st_ctime = SWAP32 (gs->st_ctim);
}
void
diff --git a/libgloss/nios2/io.h b/libgloss/nios2/io.h
index e11843516..1acc16a2d 100644
--- a/libgloss/nios2/io.h
+++ b/libgloss/nios2/io.h
@@ -57,9 +57,9 @@ struct gdb_stat {
uint64_t st_size; /* total size, in bytes */
uint64_t st_blksize; /* blocksize for filesystem I/O */
uint64_t st_blocks; /* number of blocks allocated */
- gdb_time_t st_atime; /* time of last access */
- gdb_time_t st_mtime; /* time of last modification */
- gdb_time_t st_ctime; /* time of last change */
+ gdb_time_t st_atim; /* time of last access */
+ gdb_time_t st_mtim; /* time of last modification */
+ gdb_time_t st_ctim; /* time of last change */
};
struct gdb_timeval {