Merge remote-tracking branch 'origin/update' into update
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..0a41ced
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,15 @@
+# This is the list of bazelbuild/platforms' significant contributors.
+#
+# This does not necessarily list everyone who has contributed code,
+# especially since many employees of one corporation may be contributing.
+# To see the full list of contributors, see the revision history in
+# source control.
+
+# Names should be added to this file as:
+# Name or Organization <email address>
+# The email address is not required for organizations.
+
+Google Inc.
+Austin Schuh <austin.linux@gmail.com>
+Lizan Zhou <lizan@tetrate.io>
+Mathieu Boespflug <m@tweag.io>
diff --git a/BUILD b/BUILD
index d73ff92..ad16e74 100644
--- a/BUILD
+++ b/BUILD
@@ -13,3 +13,17 @@
         "//os:srcs",
     ],
 )
+
+# For use in Incompatible Target Skipping:
+# https://docs.bazel.build/versions/master/platforms.html#skipping-incompatible-targets
+#
+# Specifically this lets targets declare incompatibility with some set of
+# platforms. See
+# https://docs.bazel.build/versions/master/platforms.html#more-expressive-constraints
+# for some more details.
+constraint_setting(name = "incompatible_setting")
+
+constraint_value(
+    name = "incompatible",
+    constraint_setting = ":incompatible_setting",
+)
diff --git a/cpu/BUILD b/cpu/BUILD
index 80c9c38..2fed273 100644
--- a/cpu/BUILD
+++ b/cpu/BUILD
@@ -26,6 +26,11 @@
 )
 
 constraint_value(
+    name = "armv6-m",  # Commonly known as thumbv6
+    constraint_setting = ":cpu",
+)
+
+constraint_value(
     name = "arm64_32",
     constraint_setting = ":cpu",
 )
@@ -74,3 +79,13 @@
     name = "x86_64",
     constraint_setting = ":cpu",
 )
+
+constraint_value(
+    name = "wasm32",
+    constraint_setting = ":cpu",
+)
+
+constraint_value(
+    name = "wasm64",
+    constraint_setting = ":cpu",
+)
diff --git a/os/BUILD b/os/BUILD
index 16525d3..53fec81 100644
--- a/os/BUILD
+++ b/os/BUILD
@@ -84,3 +84,10 @@
     name = "nixos",
     constraint_setting = ":os",
 )
+
+# WASI (WebAssembly System Interface)
+# https://github.com/bytecodealliance/wasmtime/blob/main/docs/WASI-overview.md
+constraint_value(
+    name = "wasi",
+    constraint_setting = ":os",
+)