Remove 'volatile' from TIS tests

diff --git a/tests/formal-analysis.sh b/tests/formal-analysis.sh
index 4b73c0745e794800a2489ca01198f547cebd8aef..741a13e32738cb4e4ea8773be2965420ef478e4d 100755 (executable)
--- a/tests/formal-analysis.sh
+++ b/tests/formal-analysis.sh
@@ -61,3 +61,6 @@ cp src/monocypher.c                  \
    tests/test.c                      \
    tests/vectors.h                   \
    tests/formal-analysis
+
+# Get rid of the `volatile` keyword that confuses the TIS interpreter
+sed -i 's/volatile //g' tests/formal-analysis/monocypher.c

diff --git a/tests/tis-ci-gen-config.sh b/tests/tis-ci-gen-config.sh
index 31364382ee1a5ce4b31569b85e556b3ff3a59062..4b31948fdb0f9254690dc57f81cbf5de08d2828a 100755 (executable)
--- a/tests/tis-ci-gen-config.sh
+++ b/tests/tis-ci-gen-config.sh
@@ -102,7 +102,8 @@ do
         echo '  , "tests/utils.c"'                                >> $TIS_CONFIG
         echo '  , "tests/tis-ci.c"'                               >> $TIS_CONFIG
         echo '  ]'                                                >> $TIS_CONFIG
-        echo ', "cpp-extra-args": "-Isrc -Isrc/optional -Itests"' >> $TIS_CONFIG
+        echo ', "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="' \
+                                                                  >> $TIS_CONFIG
         echo ', "machdep"       :' "\"$platform\""                >> $TIS_CONFIG
         echo ', "no-results"    : true'                           >> $TIS_CONFIG
         echo ', "main"          :' "\"$entry_point\""             >> $TIS_CONFIG

diff --git a/tis.config b/tis.config
index 0a97c6c4646a0a921ae54ba17785caed552231d1..ffe1c53dc87f5752e5cd34ea58ab1229f0979b5a 100644 (file)
--- a/tis.config
+++ b/tis.config
@@ -7,7 +7,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -19,7 +19,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -31,7 +31,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -43,7 +43,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -55,7 +55,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -67,7 +67,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -79,7 +79,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -91,7 +91,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -103,7 +103,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -115,7 +115,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "p_wipe"
@@ -127,7 +127,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -139,7 +139,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -151,7 +151,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -163,7 +163,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -175,7 +175,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -187,7 +187,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -199,7 +199,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -211,7 +211,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -223,7 +223,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -235,7 +235,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_chacha20"
@@ -247,7 +247,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -259,7 +259,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -271,7 +271,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -283,7 +283,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -295,7 +295,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -307,7 +307,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -319,7 +319,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -331,7 +331,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -343,7 +343,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -355,7 +355,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_ietf_chacha20"
@@ -367,7 +367,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -379,7 +379,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -391,7 +391,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -403,7 +403,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -415,7 +415,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -427,7 +427,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -439,7 +439,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -451,7 +451,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -463,7 +463,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -475,7 +475,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_hchacha20"
@@ -487,7 +487,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -499,7 +499,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -511,7 +511,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -523,7 +523,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -535,7 +535,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -547,7 +547,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -559,7 +559,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -571,7 +571,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -583,7 +583,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -595,7 +595,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_xchacha20"
@@ -607,7 +607,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -619,7 +619,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -631,7 +631,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -643,7 +643,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -655,7 +655,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -667,7 +667,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -679,7 +679,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -691,7 +691,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -703,7 +703,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -715,7 +715,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_poly1305"
@@ -727,7 +727,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -739,7 +739,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -751,7 +751,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -763,7 +763,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -775,7 +775,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -787,7 +787,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -799,7 +799,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -811,7 +811,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -823,7 +823,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -835,7 +835,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_aead_ietf"
@@ -847,7 +847,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -859,7 +859,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -871,7 +871,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -883,7 +883,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -895,7 +895,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -907,7 +907,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -919,7 +919,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -931,7 +931,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -943,7 +943,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -955,7 +955,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_blake2b"
@@ -967,7 +967,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -979,7 +979,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -991,7 +991,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1003,7 +1003,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1015,7 +1015,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1027,7 +1027,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1039,7 +1039,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1051,7 +1051,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1063,7 +1063,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1075,7 +1075,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_sha512"
@@ -1087,7 +1087,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1099,7 +1099,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1111,7 +1111,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1123,7 +1123,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1135,7 +1135,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1147,7 +1147,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1159,7 +1159,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1171,7 +1171,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1183,7 +1183,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1195,7 +1195,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_sha512_hmac"
@@ -1207,7 +1207,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1219,7 +1219,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1231,7 +1231,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1243,7 +1243,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1255,7 +1255,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1267,7 +1267,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1279,7 +1279,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1291,7 +1291,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1303,7 +1303,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1315,7 +1315,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_sha512_hkdf"
@@ -1327,7 +1327,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1339,7 +1339,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1351,7 +1351,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1363,7 +1363,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1375,7 +1375,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1387,7 +1387,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1399,7 +1399,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1411,7 +1411,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1423,7 +1423,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1435,7 +1435,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_argon2"
@@ -1447,7 +1447,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1459,7 +1459,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1471,7 +1471,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1483,7 +1483,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1495,7 +1495,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1507,7 +1507,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1519,7 +1519,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1531,7 +1531,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1543,7 +1543,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1555,7 +1555,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_edDSA"
@@ -1567,7 +1567,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1579,7 +1579,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1591,7 +1591,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1603,7 +1603,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1615,7 +1615,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1627,7 +1627,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1639,7 +1639,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1651,7 +1651,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1663,7 +1663,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1675,7 +1675,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_edDSA_pk"
@@ -1687,7 +1687,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1699,7 +1699,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1711,7 +1711,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1723,7 +1723,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1735,7 +1735,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1747,7 +1747,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1759,7 +1759,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1771,7 +1771,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1783,7 +1783,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1795,7 +1795,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_ed_25519"
@@ -1807,7 +1807,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1819,7 +1819,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1831,7 +1831,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1843,7 +1843,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1855,7 +1855,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1867,7 +1867,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1879,7 +1879,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1891,7 +1891,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1903,7 +1903,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1915,7 +1915,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_ed_25519_check"
@@ -1927,7 +1927,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -1939,7 +1939,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -1951,7 +1951,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -1963,7 +1963,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -1975,7 +1975,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -1987,7 +1987,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -1999,7 +1999,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -2011,7 +2011,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -2023,7 +2023,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -2035,7 +2035,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_elligator_dir"
@@ -2047,7 +2047,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2059,7 +2059,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2071,7 +2071,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2083,7 +2083,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2095,7 +2095,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2107,7 +2107,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2119,7 +2119,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2131,7 +2131,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2143,7 +2143,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2155,7 +2155,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "v_elligator_inv"
@@ -2167,7 +2167,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2179,7 +2179,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2191,7 +2191,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2203,7 +2203,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2215,7 +2215,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2227,7 +2227,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2239,7 +2239,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2251,7 +2251,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2263,7 +2263,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2275,7 +2275,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "p_eddsa_x25519"
@@ -2287,7 +2287,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2299,7 +2299,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2311,7 +2311,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2323,7 +2323,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2335,7 +2335,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2347,7 +2347,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2359,7 +2359,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2371,7 +2371,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2383,7 +2383,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2395,7 +2395,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "p_dirty"
@@ -2407,7 +2407,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2419,7 +2419,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2431,7 +2431,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2443,7 +2443,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2455,7 +2455,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2467,7 +2467,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2479,7 +2479,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2491,7 +2491,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2503,7 +2503,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2515,7 +2515,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "p_x25519_inverse"
@@ -2527,7 +2527,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2539,7 +2539,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2551,7 +2551,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2563,7 +2563,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2575,7 +2575,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2587,7 +2587,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2599,7 +2599,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2611,7 +2611,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2623,7 +2623,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2635,7 +2635,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "p_verify16"
@@ -2647,7 +2647,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2659,7 +2659,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2671,7 +2671,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2683,7 +2683,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2695,7 +2695,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2707,7 +2707,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2719,7 +2719,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2731,7 +2731,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2743,7 +2743,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2755,7 +2755,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "p_verify32"
@@ -2767,7 +2767,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "sparc_32"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2779,7 +2779,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_32"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2791,7 +2791,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_16"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2803,7 +2803,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "x86_win64"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2815,7 +2815,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "armeb_eabi"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2827,7 +2827,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "arm_eabi"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2839,7 +2839,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "aarch64"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2851,7 +2851,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "rv64ifdq"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2863,7 +2863,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "mips_64"
 , "no-results"    : true
 , "main"          : "p_verify64"
@@ -2875,7 +2875,7 @@
   , "tests/utils.c"
   , "tests/tis-ci.c"
   ]
-, "cpp-extra-args": "-Isrc -Isrc/optional -Itests"
+, "cpp-extra-args": "-Isrc -Isrc/optional -Itests -Dvolatile="
 , "machdep"       : "ppc_64"
 , "no-results"    : true
 , "main"          : "p_verify64"