From 6d7e9786b9c6cfc6682f0c5230f910d89dc140f0 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Mon, 19 Aug 2019 18:01:45 -0400
Subject: [PATCH] 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
---
 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 3e2f9af8c..c36f28488 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 4092998be..8769112b0 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;