diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 23:13:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-20 23:13:13 +0100 |
| commit | 490215cbd70ef3e5f0b7cf544f1980bd6e55042e (patch) | |
| tree | 2c0351923c31d06d98ac9395d2b66f839a57159c /libavutil/aarch64 | |
| parent | 1859b1de31bdfbe6761b4996dc4d8cf1f8c273cd (diff) | |
| parent | 9c029f67ca82147ddfa83a1546ee1e109e11fbd4 (diff) | |
Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'
* commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4':
aarch64: use EXTERN_ASM consistently for exported symbols
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/aarch64')
| -rw-r--r-- | libavutil/aarch64/asm.S | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S index 3b6abba9f5..51850ec7ba 100644 --- a/libavutil/aarch64/asm.S +++ b/libavutil/aarch64/asm.S @@ -36,11 +36,14 @@ ELF .size \name, . - \name .align \align .if \export .global EXTERN_ASM\name +ELF .type EXTERN_ASM\name, %function + .func EXTERN_ASM\name EXTERN_ASM\name: - .endif + .else ELF .type \name, %function .func \name \name: + .endif .endm .macro const name, align=2 @@ -61,3 +64,7 @@ ELF .size \name, . - \name ldr \rd, =\val #endif .endm + +#define GLUE(a, b) a ## b +#define JOIN(a, b) GLUE(a, b) +#define X(s) JOIN(EXTERN_ASM, s) |