public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Revert previous change to sys/stat.h and fix cris libgloss
@ 2019-08-19 22:04 Jeff Johnston
0 siblings, 0 replies; only message in thread
From: Jeff Johnston @ 2019-08-19 22:04 UTC (permalink / raw)
To: newlib-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b99887c4283f7b21428d21f98ae9f6fcf573c756
commit b99887c4283f7b21428d21f98ae9f6fcf573c756
Author: Jeff Johnston <jjohnstn@redhat.com>
Date: Mon Aug 19 18:01:45 2019 -0400
Revert previous change to sys/stat.h and fix cris libgloss
- revert previous fix which altered sys/stat.h
- fix libgloss/cris/gensyscalls to undef st_atime, st_mtime,
and st_ctime macros which cannot be used with new_stat structure
Diff:
---
libgloss/cris/gensyscalls | 18 ++++++++++++------
newlib/libc/include/sys/stat.h | 9 ---------
2 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/libgloss/cris/gensyscalls b/libgloss/cris/gensyscalls
index 3e2f9af..c36f284 100644
--- a/libgloss/cris/gensyscalls
+++ b/libgloss/cris/gensyscalls
@@ -60,6 +60,9 @@ EOF
cat > fstat.c <<EOF
$lu#include <string.h>
#include <sys/stat.h>
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
int
_fstat (int fd, struct stat *buf)
{
@@ -81,9 +84,9 @@ _fstat (int fd, struct stat *buf)
buf->st_size = ks.st_size;
buf->st_blksize = ks.st_blksize;
buf->st_blocks = ks.st_blocks;
- buf->st_atime = ks.st_atime;
- buf->st_mtime = ks.st_mtime;
- buf->st_ctime = ks.st_ctime;
+ buf->st_atim.tv_sec = ks.st_atime;
+ buf->st_mtim.tv_sec = ks.st_mtime;
+ buf->st_ctim.tv_sec = ks.st_ctime;
R (retval)
EOF
cat > getpid.c <<EOF
@@ -216,6 +219,9 @@ EOF
cat > stat.c <<EOF
$lu#include <string.h>
#include <sys/stat.h>
+#undef st_atime
+#undef st_mtime
+#undef st_ctime
int
_stat (const char *path, struct stat *buf)
{
@@ -237,9 +243,9 @@ _stat (const char *path, struct stat *buf)
buf->st_size = ks.st_size;
buf->st_blksize = ks.st_blksize;
buf->st_blocks = ks.st_blocks;
- buf->st_atime = ks.st_atime;
- buf->st_mtime = ks.st_mtime;
- buf->st_ctime = ks.st_ctime;
+ buf->st_atim.tv_sec = ks.st_atime;
+ buf->st_mtim.tv_sec = ks.st_mtime;
+ buf->st_ctim.tv_sec = ks.st_ctime;
R (retval)
EOF
cat > times.c <<EOF
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index 4092998..8769112 100644
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -38,15 +38,6 @@ struct stat
time_t st_atime;
time_t st_mtime;
time_t st_ctime;
-#elif defined(__cris__)
- time_t st_atime;
- long st_spare1;
- time_t st_mtime;
- long st_spare2;
- time_t st_ctime;
- long st_spare3;
- blksize_t st_blksize;
- blkcnt_t st_blocks;
#else
struct timespec st_atim;
struct timespec st_mtim;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-08-19 22:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-19 22:04 [newlib-cygwin] Revert previous change to sys/stat.h and fix cris libgloss Jeff Johnston
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).