summaryrefslogtreecommitdiffstats
path: root/docs/user/main.rst
diff options
context:
space:
mode:
authorPeter Maydell2020-03-09 22:58:18 +0100
committerPeter Maydell2020-03-12 12:20:20 +0100
commit6fe6d6c9a953901251e1a85088f0a61ff5caf648 (patch)
tree1a6fd6d7c792d6bcebe4313d1795f3b4c4eac047 /docs/user/main.rst
parentdocs: Move arm-cpu-features.rst into the system manual (diff)
downloadqemu-6fe6d6c9a953901251e1a85088f0a61ff5caf648.tar.gz
qemu-6fe6d6c9a953901251e1a85088f0a61ff5caf648.tar.xz
qemu-6fe6d6c9a953901251e1a85088f0a61ff5caf648.zip
docs: Be consistent about capitalization of 'Arm'
The company 'Arm' went through a rebranding some years back involving a recapitalization from 'ARM' to 'Arm'. As a result our documentation is a bit inconsistent between the two forms. It's not worth trying to update everywhere in QEMU, but it's easy enough to make docs/ consistent. Note that "ARMv8" and similar architecture names, and older CPU names like "ARM926" still retain all-caps. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Niek Linnenbank <nieklinnenbank@gmail.com> Message-id: 20200309215818.2021-6-peter.maydell@linaro.org
Diffstat (limited to 'docs/user/main.rst')
-rw-r--r--docs/user/main.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/user/main.rst b/docs/user/main.rst
index ca69f7727d..bd99b0fdbe 100644
--- a/docs/user/main.rst
+++ b/docs/user/main.rst
@@ -35,7 +35,7 @@ QEMU user space emulation has the following notable features:
On Linux, QEMU can emulate the ``clone`` syscall and create a real
host thread (with a separate virtual CPU) for each emulated thread.
Note that not all targets currently emulate atomic operations
- correctly. x86 and ARM use a global lock in order to preserve their
+ correctly. x86 and Arm use a global lock in order to preserve their
semantics.
QEMU was conceived so that ultimately it can emulate itself. Although it
@@ -173,11 +173,11 @@ Other binaries
user mode (Alpha)
``qemu-alpha`` TODO.
-user mode (ARM)
+user mode (Arm)
``qemu-armeb`` TODO.
-user mode (ARM)
-``qemu-arm`` is also capable of running ARM \"Angel\" semihosted ELF
+user mode (Arm)
+``qemu-arm`` is also capable of running Arm \"Angel\" semihosted ELF
binaries (as implemented by the arm-elf and arm-eabi Newlib/GDB
configurations), and arm-uclinux bFLT format binaries.