From 9e1558d3223ebe758877768711f3e4281d0eae4b Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Wed, 24 Apr 2019 11:04:22 +0000 Subject: [PATCH] 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 --- libphobos/libdruntime/MERGE | 2 +- 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 27dfc5fc1d9..9fe51fd5ae9 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 ab1fcd7b164..963a241f076 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) { -- 2.30.2