From dddf3bb0c37e8ff7f2c0488a46edfa18716d8a00 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Mon, 5 Apr 2021 14:05:28 +0200 Subject: d: Merge upstream dmd 5cc71ff83, druntime 1134b710 D front-end changes: - Fix ICEs that occurred when using opaque enums. - Update `pragma(printf)' checking code to work on 16-bit targets. Phobos change: - Don't compile in argTypes code on AArch64 Reviewed-on: https://github.com/dlang/dmd/pull/12378 https://github.com/dlang/druntime/pull/3431 gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd 5cc71ff83. libphobos/ChangeLog: * libdruntime/MERGE: Merge upstream druntime 1134b710. --- libphobos/libdruntime/MERGE | 2 +- libphobos/libdruntime/object.d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libphobos/libdruntime') diff --git a/libphobos/libdruntime/MERGE b/libphobos/libdruntime/MERGE index b797682..d839a08 100644 --- a/libphobos/libdruntime/MERGE +++ b/libphobos/libdruntime/MERGE @@ -1,4 +1,4 @@ -483bc12977af3c1288fd52e7b4fa14b716896c5a +1134b71039881464e9bf021836d82796b3a1fcfc 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/object.d b/libphobos/libdruntime/object.d index c05643b..e96d1c4 100644 --- a/libphobos/libdruntime/object.d +++ b/libphobos/libdruntime/object.d @@ -42,7 +42,7 @@ else version (X86_64) else version (Windows) { /* no need for Win64 ABI */ } else version = WithArgTypes; } -version (AArch64) +else version (AArch64) { // Apple uses a trivial varargs implementation version (OSX) {} -- cgit v1.1