diff options
| author | Mike Pall <mike> | 2013-06-03 17:32:09 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-06-03 17:32:09 +0200 |
| commit | e92d64a841a068a29364a58357063b71c5b774a2 (patch) | |
| tree | 0c7a57105e03ad61e832414ff97980ad1e25611a /src/vm_ppc.dasc | |
| parent | 45f3ee87945e69f9e601dbe5d5f3708d00926e4d (diff) | |
| parent | 338e9863c220462201fde0e725aba4002310c849 (diff) | |
| download | luajit-e92d64a841a068a29364a58357063b71c5b774a2.tar.gz luajit-e92d64a841a068a29364a58357063b71c5b774a2.tar.bz2 luajit-e92d64a841a068a29364a58357063b71c5b774a2.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/vm_ppc.dasc')
| -rw-r--r-- | src/vm_ppc.dasc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc index 6bceff9c..a7707ccc 100644 --- a/src/vm_ppc.dasc +++ b/src/vm_ppc.dasc | |||
| @@ -49,7 +49,7 @@ | |||
| 49 | |// Convenience macros for TOC handling. | 49 | |// Convenience macros for TOC handling. |
| 50 | |.if TOC | 50 | |.if TOC |
| 51 | |// Linker needs a TOC patch area for every external call relocation. | 51 | |// Linker needs a TOC patch area for every external call relocation. |
| 52 | |.macro blex, target; bl extern target; nop; .endmacro | 52 | |.macro blex, target; bl extern target@plt; nop; .endmacro |
| 53 | |.macro .toc, a, b; a, b; .endmacro | 53 | |.macro .toc, a, b; a, b; .endmacro |
| 54 | |.if P64 | 54 | |.if P64 |
| 55 | |.define TOC_OFS, 8 | 55 | |.define TOC_OFS, 8 |
| @@ -59,7 +59,7 @@ | |||
| 59 | |.define ENV_OFS, 8 | 59 | |.define ENV_OFS, 8 |
| 60 | |.endif | 60 | |.endif |
| 61 | |.else // No TOC. | 61 | |.else // No TOC. |
| 62 | |.macro blex, target; bl extern target; .endmacro | 62 | |.macro blex, target; bl extern target@plt; .endmacro |
| 63 | |.macro .toc, a, b; .endmacro | 63 | |.macro .toc, a, b; .endmacro |
| 64 | |.endif | 64 | |.endif |
| 65 | |.macro .tocenv, a, b; .if TOCENV; a, b; .endif; .endmacro | 65 | |.macro .tocenv, a, b; .if TOCENV; a, b; .endif; .endmacro |