diff --git a/docs/StackMaps.rst b/docs/StackMaps.rst
index dbdf78f992c..5bdae38b699 100644
--- a/docs/StackMaps.rst
+++ b/docs/StackMaps.rst
@@ -499,3 +499,13 @@ the same requirement imposed by the llvm.gcroot intrinsic.) LLVM
 transformations must not substitute the alloca with any intervening
 value. This can be verified by the runtime simply by checking that the
 stack map's location is a Direct location type.
+
+
+Supported Architectures
+=======================
+
+Support for StackMap generation and the related intrinsics requires 
+some code for each backend.  Today, only a subset of LLVM's backends 
+are supported.  The currently supported architectures are X86_64, 
+PowerPC, and Aarch64.
+
diff --git a/docs/Statepoints.rst b/docs/Statepoints.rst
index b1d1ed8dc10..0d91f1b16b0 100644
--- a/docs/Statepoints.rst
+++ b/docs/Statepoints.rst
@@ -699,6 +699,12 @@ deoptimization or introspection) at safepoints.  In that case, ask on the
 llvmdev mailing list for suggestions.
 
 
+Supported Architectures
+=======================
+
+Support for statepoint generation requires some code for each backend.
+Today, only X86_64 is supported.  
+
 Bugs and Enhancements
 =====================