Merge pull request #6994 from luismarques/d16

Add MSP430, D_P16 version identifiers merged-on-behalf-of: Martin Nowak <code@dawg.eu>
dlang · Aug 8, 2017 · bcf99db · bcf99db
2 parents d61411b + 2d32932
commit bcf99db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/ddmd/cond.d b/src/ddmd/cond.d
@@ -642,6 +642,7 @@ extern (C++) final class VersionCondition : DVCondition
             "MIPS_EABI",
             "MIPS_SoftFloat",
             "MIPS_HardFloat",
+            "MSP430",
             "NVPTX",
             "NVPTX64",
             "RISCV32",

diff --git a/test/fail_compilation/reserved_version.d b/test/fail_compilation/reserved_version.d
@@ -2,6 +2,8 @@
 /*
 TEST_OUTPUT:
 ---
+fail_compilation/reserved_version.d(105): Error: version identifier `MSP430` is reserved and cannot be set
+fail_compilation/reserved_version.d(106): Error: version identifier `D_P16` is reserved and cannot be set
 fail_compilation/reserved_version.d(107): Error: version identifier `DigitalMars` is reserved and cannot be set
 fail_compilation/reserved_version.d(108): Error: version identifier `GNU` is reserved and cannot be set
 fail_compilation/reserved_version.d(109): Error: version identifier `LDC` is reserved and cannot be set
@@ -100,10 +102,8 @@ fail_compilation/reserved_version.d(201): Error: version identifier `none` is re
 
 // Some extra empty lines to help fixup the manual line numbering after adding new version identifiers
 
-
-
-
-
+version = MSP430;
+version = D_P16;
 version = DigitalMars;
 version = GNU;
 version = LDC;
@@ -294,3 +294,5 @@ debug = D_NoBoundsChecks;
 //debug = assert;
 debug = all;
 debug = none;
+debug = D_P16;
+debug = MSP430;