aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/doc/src/compile.xml
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2013-12-19 10:15:40 +0100
committerBjörn Gustavsson <[email protected]>2013-12-19 10:15:40 +0100
commit7fcde0281c04170595d437dc0480f4cd690c6fde (patch)
tree353cf81814416569c645236a20fa2f8daff6d94f /lib/compiler/doc/src/compile.xml
parent3ee4bd41cdebf355447571fc9cb10b4fe5132ad9 (diff)
parent455c8238535d2754234cd68bbf7caba9960607d6 (diff)
downloadotp-7fcde0281c04170595d437dc0480f4cd690c6fde.tar.gz
otp-7fcde0281c04170595d437dc0480f4cd690c6fde.tar.bz2
otp-7fcde0281c04170595d437dc0480f4cd690c6fde.zip
Merge branch 'ta/compiler/asm-core/OTP-11547'
* ta/compiler/asm-core/OTP-11547: Officially support building core files Officially support building assembler files
Diffstat (limited to 'lib/compiler/doc/src/compile.xml')
-rw-r--r--lib/compiler/doc/src/compile.xml12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/compiler/doc/src/compile.xml b/lib/compiler/doc/src/compile.xml
index 73d75851cf..1459f696a0 100644
--- a/lib/compiler/doc/src/compile.xml
+++ b/lib/compiler/doc/src/compile.xml
@@ -350,12 +350,18 @@ module.beam: module.erl \
parsed code before the code is checked for errors.</p>
</item>
- <tag><c>asm</c></tag>
+ <tag><c>from_asm</c></tag>
<item>
<p>The input file is expected to be assembler code (default
file suffix ".S"). Note that the format of assembler files
- is not documented, and may change between releases - this
- option is primarily for internal debugging use.</p>
+ is not documented, and may change between releases.</p>
+ </item>
+
+ <tag><c>from_core</c></tag>
+ <item>
+ <p>The input file is expected to be core code (default
+ file suffix ".core"). Note that the format of core files
+ is not documented, and may change between releases.</p>
</item>
<tag><c>no_strict_record_tests</c></tag>