summaryrefslogtreecommitdiff
path: root/gcc/d
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2020-04-27 01:43:34 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2020-04-27 02:47:27 +0200
commit873b5de87c3186d85bb497b0f9c13b8c5e425712 (patch)
tree4300977805be65898942d64914b121533ef97001 /gcc/d
parent2370bdbb0b29b14401d8508d846c0e01c64d82fc (diff)
d: Merge upstream dmd f8a1a5153, druntime 2b5c0b27
Adds a new test directive COMPILABLE_MATH_TEST, and support has been added for it in gdc-convert-test so that they are skipped if phobos is not present on the target. Only change in D runtime is a small documentation fix. Reviewed-on: https://github.com/dlang/druntime/pull/3067 https://github.com/dlang/dmd/pull/11060 gcc/testsuite/ChangeLog: PR d/89418 * lib/gdc-utils.exp (gdc-convert-test): Add dg-skip-if for compilable tests that depend on the phobos standard library.
Diffstat (limited to 'gcc/d')
-rw-r--r--gcc/d/dmd/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index a878cb9f42e..f933cf1c992 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@
-09db0c41ee922502fa0966bde24c1cb9b15ad436
+f8a1a515346b16ebbd9da56a908540cbef1ee582
The first line of this file holds the git revision number of the last
merge done from the dlang/dmd repository.