Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall
2013-06-03 17:32:09 +02:00
3 changed files with 15 additions and 9 deletions

View File

@@ -49,7 +49,7 @@
|// Convenience macros for TOC handling.
|.if TOC
|// Linker needs a TOC patch area for every external call relocation.
|.macro blex, target; bl extern target; nop; .endmacro
|.macro blex, target; bl extern target@plt; nop; .endmacro
|.macro .toc, a, b; a, b; .endmacro
|.if P64
|.define TOC_OFS, 8
@@ -59,7 +59,7 @@
|.define ENV_OFS, 8
|.endif
|.else // No TOC.
|.macro blex, target; bl extern target; .endmacro
|.macro blex, target; bl extern target@plt; .endmacro
|.macro .toc, a, b; .endmacro
|.endif
|.macro .tocenv, a, b; .if TOCENV; a, b; .endif; .endmacro