diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2021-02-15 21:20:35 +0100 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@bitrange.com> | 2021-02-16 13:57:11 +0100 |
| commit | 571e73067898f9e82d295b3526de73e7f44e9f89 (patch) | |
| tree | e6a0dcc901c434f763928643550ecfbf6a26d019 | |
| parent | 2caca30309eae73fef4bf14af947ad9cc9551eeb (diff) | |
| download | newlib-571e73067898f9e82d295b3526de73e7f44e9f89.zip newlib-571e73067898f9e82d295b3526de73e7f44e9f89.tar.gz newlib-571e73067898f9e82d295b3526de73e7f44e9f89.tar.bz2 | |
Complete revert of 2019-08-19, st_atime in libc/include/sys/stat.h
The revert-part of the revert-and-fix commit, b99887c4283f a.k.a.
"Revert previous change to sys/stat.h and fix cris libgloss",
apparently intending to revert f75aa6785151 a.k.a. "Fix regression in
cris-elf caused by sys/stat.h change" and fix it in another way,
wasn't complete. Although the fix-part added the prerequisite "#undef
st_atime" (et al) to gensyscalls, the revert-part didn't revert the
"&& !defined(__cris__)" in sys/stat.h, stopping st_atime (et al) from
being defined.
The effect of the unreverted change is that accessing the struct stat
compatibility member names "st_atime" (et al) as in "struct stat
mystat; mystat.st_atime;" yields errors, observable for example when
building libgfortran in gcc:
/x/gcc/libgfortran/intrinsics/stat.c:114:42: error: 'struct stat' has \
no member named 'st_atime'; did you mean 'st_atim'?
114 | sarray->base_addr[8 * stride] = sb.st_atime;
| ^~~~~~~~
| st_atim
(etc.)
Trivially fixed by completing the reversion, removing the "&&
!defined(__cris__)" in sys/stat.h.
Beware: the net effect of the earlier related change to struct stat in
sys/stat.h, leading up to the fix, *does* change its definition as a
type. Thankfully, replacing members like "time_t st_atime; long
st_spare1;" by "struct timespec st_atim;", ditto st_mtim and st_ctim,
is layout-compatible. To wit, that change is "binary compatible".
Incidentally, related to the simulator / Linux ABI, there's a
transitional stage (see gensyscalls), reloading between "struct stat"
(sys/stat.h) and "struct new_stat" (kernel/simulator) as necessary.
Tested by a cris-elf gcc build (including libgfortran).
| -rw-r--r-- | newlib/libc/include/sys/stat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h index 722ed0e..68f839b 100644 --- a/newlib/libc/include/sys/stat.h +++ b/newlib/libc/include/sys/stat.h @@ -50,7 +50,7 @@ struct stat #endif }; -#if !(defined(__svr4__) && !defined(__PPC__) && !defined(__sun__)) && !defined(__cris__) +#if !(defined(__svr4__) && !defined(__PPC__) && !defined(__sun__)) #define st_atime st_atim.tv_sec #define st_ctime st_ctim.tv_sec #define st_mtime st_mtim.tv_sec |