public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] Adjust nios2 and m68k semihosting for sys/stat.h changes.
Date: Wed, 04 Sep 2019 07:44:00 -0000	[thread overview]
Message-ID: <20190904074451.73415.qmail@sourceware.org> (raw)

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 {


                 reply	other threads:[~2019-09-04  7:44 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190904074451.73415.qmail@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).