[pypy-commit] pypy release-5.x: fix merge

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: release-5.x
Changeset: r84945:bfd2d6afe938
Date: 2016-06-05 22:48 +0300
http://bitbucket.org/pypy/pypy/changeset/bfd2d6afe938/

Log:	fix merge

diff --git a/rpython/doc/s390x.rst b/rpython/doc/s390x.rst
new file mode 100644
--- /dev/null
+++ b/rpython/doc/s390x.rst
@@ -0,0 +1,20 @@
+.. _s390x:
+
+S390X JIT Backend
+=================
+
+Our JIT implements the 64 bit version of the IBM Mainframe called s390x.
+Note that this architecture is big endian.
+
+The following facilities need to be installed to operate
+correctly (all of the machines used for development these where installed):
+
+* General-Instructions-Extension
+* Long-Displacement
+* Binary Floating Point (IEEE)
+
+Translating
+-----------
+
+Ensure that libffi is installed (version should do > 3.0.+).
+CPython should be version 2.7.+.