diff options
| author | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-04-24 11:04:22 +0000 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gcc.gnu.org> | 2019-04-24 11:04:22 +0000 |
| commit | 9e1558d3223ebe758877768711f3e4281d0eae4b (patch) | |
| tree | 353cd0bd915c22aaa98ccca60c87cef2f4febe45 /libphobos | |
| parent | fe3ddee943061bd1f93c42f5c37fbc2c2155a15e (diff) | |
| download | gcc-9e1558d3223ebe758877768711f3e4281d0eae4b.zip gcc-9e1558d3223ebe758877768711f3e4281d0eae4b.tar.gz gcc-9e1558d3223ebe758877768711f3e4281d0eae4b.tar.bz2 | |
libphobos: Fix assert in core.sys.posix.sys.stat for aarch64/ilp32.
Merges upstream druntime 51365217.
Reviewed-on: https://github.com/dlang/druntime/pull/2579
From-SVN: r270541
Diffstat (limited to 'libphobos')
| -rw-r--r-- | libphobos/libdruntime/MERGE | 2 | ||||
| -rw-r--r-- | libphobos/libdruntime/core/sys/posix/sys/stat.d | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE index 27dfc5f..9fe51fd 100644 --- a/libphobos/libdruntime/MERGE +++ b/libphobos/libdruntime/MERGE @@ -1,4 +1,4 @@ -b43203a134fb5e259ffc1711cc061c6e869b56f6 +513652173d6f02206be3ddaa2b6ed0b191ea4e3d The first line of this file holds the git revision number of the last merge done from the dlang/druntime repository. diff --git a/libphobos/libdruntime/core/sys/posix/sys/stat.d b/libphobos/libdruntime/core/sys/posix/sys/stat.d index ab1fcd7..963a241 100644 --- a/libphobos/libdruntime/core/sys/posix/sys/stat.d +++ b/libphobos/libdruntime/core/sys/posix/sys/stat.d @@ -709,10 +709,10 @@ version (CRuntime_Glibc) } int[2] __unused; } - static if (__USE_FILE_OFFSET64) + version (D_LP64) static assert(stat_t.sizeof == 128); else - static assert(stat_t.sizeof == 128); + static assert(stat_t.sizeof == 104); } else version (SPARC64) { |