summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorCharles Crayne <chuck@thor.crayne.org>2007-11-17 21:08:33 -0800
committerCharles Crayne <chuck@thor.crayne.org>2007-11-17 21:08:33 -0800
commitdb90f35d89d07929e2110e3f9d97532bf2554374 (patch)
tree33319c1eab4170bec2554610244069bdeb67647e /doc
parentc9588ea1bc313a4365d7507411b8f1524872318e (diff)
downloadnasm-db90f35d89d07929e2110e3f9d97532bf2554374.tar.gz
nasm-db90f35d89d07929e2110e3f9d97532bf2554374.tar.bz2
nasm-db90f35d89d07929e2110e3f9d97532bf2554374.zip
Check in Keith's Fixes
1. Don't warn on 32-bit overflow 2. Change EM64T to Intel 64 in Defining CPU Dependencies section of documentation.
Diffstat (limited to 'doc')
-rw-r--r--doc/nasmdoc.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index b78eab3..d5eeaf1 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -3782,7 +3782,7 @@ Options are:
\b\c{CPU PRESCOTT} Prescott instruction set
-\b\c{CPU X64} x86-64 (x64/AMD64/EM64T) instruction set
+\b\c{CPU X64} x86-64 (x64/AMD64/Intel 64) instruction set
\b\c{CPU IA64} IA64 CPU (in x86 mode) instruction set