diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-21 17:08:28 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-06-22 06:00:52 -0400 |
| commit | 4b3eaf1b66b4807b437023180800fed2e0bc965b (patch) | |
| tree | 781de8bf93f44ef6256b572c2923b8f60c802ca9 | |
| parent | a48a9217e4efa2dddfd8338fad858933b3cf573b (diff) | |
| download | meson-4b3eaf1b66b4807b437023180800fed2e0bc965b.zip meson-4b3eaf1b66b4807b437023180800fed2e0bc965b.tar.gz meson-4b3eaf1b66b4807b437023180800fed2e0bc965b.tar.bz2 | |
Tag functions in asm properly. Thanks to Matthias Klose for debugging the issue.
6 files changed, 31 insertions, 12 deletions
diff --git a/test cases/common/127 cpp and asm/retval-arm.S b/test cases/common/127 cpp and asm/retval-arm.S index 8b37197..a892362 100644 --- a/test cases/common/127 cpp and asm/retval-arm.S +++ b/test cases/common/127 cpp and asm/retval-arm.S @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - mov r0, #0 - mov pc, lr + mov r0, #0 + mov pc, lr diff --git a/test cases/common/127 cpp and asm/retval-x86.S b/test cases/common/127 cpp and asm/retval-x86.S index 06bd75c..f9e8190 100644 --- a/test cases/common/127 cpp and asm/retval-x86.S +++ b/test cases/common/127 cpp and asm/retval-x86.S @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retl + xorl %eax, %eax + retl diff --git a/test cases/common/127 cpp and asm/retval-x86_64.S b/test cases/common/127 cpp and asm/retval-x86_64.S index 638921e..1a5f3eb 100644 --- a/test cases/common/127 cpp and asm/retval-x86_64.S +++ b/test cases/common/127 cpp and asm/retval-x86_64.S @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retq + xorl %eax, %eax + retq diff --git a/test cases/common/141 c cpp and asm/retval-arm.S b/test cases/common/141 c cpp and asm/retval-arm.S index 8b37197..a892362 100644 --- a/test cases/common/141 c cpp and asm/retval-arm.S +++ b/test cases/common/141 c cpp and asm/retval-arm.S @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - mov r0, #0 - mov pc, lr + mov r0, #0 + mov pc, lr diff --git a/test cases/common/141 c cpp and asm/retval-x86.S b/test cases/common/141 c cpp and asm/retval-x86.S index 06bd75c..3cb0237 100644 --- a/test cases/common/141 c cpp and asm/retval-x86.S +++ b/test cases/common/141 c cpp and asm/retval-x86.S @@ -2,7 +2,11 @@ .text .globl SYMBOL_NAME(get_retval) +/* Only supported on Linux with GAS */ +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retl + xorl %eax, %eax + retl diff --git a/test cases/common/141 c cpp and asm/retval-x86_64.S b/test cases/common/141 c cpp and asm/retval-x86_64.S index 638921e..1a5f3eb 100644 --- a/test cases/common/141 c cpp and asm/retval-x86_64.S +++ b/test cases/common/141 c cpp and asm/retval-x86_64.S @@ -2,7 +2,10 @@ .text .globl SYMBOL_NAME(get_retval) +# ifdef __linux__ +.type get_retval, %function +#endif SYMBOL_NAME(get_retval): - xorl %eax, %eax - retq + xorl %eax, %eax + retq |