public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Adjust nios2 and m68k semihosting for sys/stat.h changes.
@ 2019-09-04 7:44 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2019-09-04 7:44 UTC (permalink / raw)
To: newlib-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=fa29288ef162250ce67499832ca0f471b2a1c949
commit fa29288ef162250ce67499832ca0f471b2a1c949
Author: Sandra Loosemore <sandra@codesourcery.com>
Date: Tue Sep 3 09:35:18 2019 -0600
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>
Diff:
---
libgloss/m68k/io-gdb.c | 6 +++---
libgloss/m68k/io.h | 6 +++---
libgloss/nios2/io-gdb.c | 6 +++---
libgloss/nios2/io.h | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/libgloss/m68k/io-gdb.c b/libgloss/m68k/io-gdb.c
index 4f16b2f..e662226 100644
--- a/libgloss/m68k/io-gdb.c
+++ b/libgloss/m68k/io-gdb.c
@@ -94,9 +94,9 @@ __hosted_from_gdb_stat (const struct gdb_stat *gs,
s->st_size = gs->st_size;
s->st_blksize = gs->st_blksize;
s->st_blocks = gs->st_blocks;
- s->st_atime = gs->st_atime;
- s->st_mtime = gs->st_mtime;
- s->st_ctime = gs->st_ctime;
+ s->st_atime = gs->st_atim;
+ s->st_mtime = gs->st_mtim;
+ s->st_ctime = gs->st_ctim;
}
void
diff --git a/libgloss/m68k/io.h b/libgloss/m68k/io.h
index b6b2287..be94728 100644
--- a/libgloss/m68k/io.h
+++ b/libgloss/m68k/io.h
@@ -58,9 +58,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 {
diff --git a/libgloss/nios2/io-gdb.c b/libgloss/nios2/io-gdb.c
index ee58559..48a5be6 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 e118435..1acc16a 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 {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-09-04 7:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-04 7:44 [newlib-cygwin] Adjust nios2 and m68k semihosting for sys/stat.h changes Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).