summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2010-06-29 22:34:52 +0000
committerBill Wendling <isanbard@gmail.com>2010-06-29 22:34:52 +0000
commit07d317711781d8c9268f7d6afcf1ba7eadf1d127 (patch)
tree2e2826cb827a826cfdcd2e475e9b69dfd0b1009f /docs
parente025e966a863229feb7ad188f520ce213bb30a34 (diff)
downloadllvm-07d317711781d8c9268f7d6afcf1ba7eadf1d127.tar.gz
llvm-07d317711781d8c9268f7d6afcf1ba7eadf1d127.tar.bz2
llvm-07d317711781d8c9268f7d6afcf1ba7eadf1d127.tar.xz
Revert r107205 and r107207.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@107215 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'docs')
-rw-r--r--docs/LangRef.html35
1 files changed, 13 insertions, 22 deletions
diff --git a/docs/LangRef.html b/docs/LangRef.html
index 1158a5760d..32f143a93a 100644
--- a/docs/LangRef.html
+++ b/docs/LangRef.html
@@ -24,7 +24,6 @@
<ol>
<li><a href="#linkage_private">'<tt>private</tt>' Linkage</a></li>
<li><a href="#linkage_linker_private">'<tt>linker_private</tt>' Linkage</a></li>
- <li><a href="#linkage_linker_weak">'<tt>linker_weak</tt>' Linkage</a></li>
<li><a href="#linkage_internal">'<tt>internal</tt>' Linkage</a></li>
<li><a href="#linkage_available_externally">'<tt>available_externally</tt>' Linkage</a></li>
<li><a href="#linkage_linkonce">'<tt>linkonce</tt>' Linkage</a></li>
@@ -547,31 +546,23 @@ define i32 @main() { <i>; i32()* </i>
<dl>
<dt><tt><b><a name="linkage_private">private</a></b></tt></dt>
- <dd>Global values with "<tt>private</tt>" linkage are only directly accessible
- by objects in the current module. In particular, linking code into a
- module with an private global value may cause the private to be renamed as
- necessary to avoid collisions. Because the symbol is private to the
- module, all references can be updated. This doesn't show up in any symbol
- table in the object file.</dd>
+ <dd>Global values with private linkage are only directly accessible by objects
+ in the current module. In particular, linking code into a module with an
+ private global value may cause the private to be renamed as necessary to
+ avoid collisions. Because the symbol is private to the module, all
+ references can be updated. This doesn't show up in any symbol table in the
+ object file.</dd>
<dt><tt><b><a name="linkage_linker_private">linker_private</a></b></tt></dt>
- <dd>Similar to <tt>private</tt>, but the symbol is passed through the
- assembler and removed by the linker after evaluation. Note that (unlike
- <tt>private</tt> symbols) <tt>linker_private</tt> symbols are subject to
- coalescing by the linker: weak symbols get merged and redefinitions are
- rejected. However, unlike normal strong symbols, they are removed by the
- linker from the final linked image (executable or dynamic library).
- This is currently only used for Objective-C metadata.</dd>
-
- <dt><tt><b><a name="linkage_linker_weak">linker_weak</a></b></tt></dt>
- <dd>Global values with "<tt>linker_weak</tt>" linkage are given weak linkage,
- but are removed by the linker after evaluation. Unlike normal weak
- symbols, linker weak symbols are removed by the linker from the linal
- linked image (executable or dynamic library). This is currently only used
- for Objective-C metadata.</dd>
+ <dd>Similar to private, but the symbol is passed through the assembler and
+ removed by the linker after evaluation. Note that (unlike private
+ symbols) linker_private symbols are subject to coalescing by the linker:
+ weak symbols get merged and redefinitions are rejected. However, unlike
+ normal strong symbols, they are removed by the linker from the final
+ linked image (executable or dynamic library).</dd>
<dt><tt><b><a name="linkage_internal">internal</a></b></tt></dt>
- <dd>Similar to <tt>private</tt>, but the value shows as a local symbol
+ <dd>Similar to private, but the value shows as a local symbol
(<tt>STB_LOCAL</tt> in the case of ELF) in the object file. This
corresponds to the notion of the '<tt>static</tt>' keyword in C.</dd>