diff options
| author | sterlingjensen <[email protected]> | 2020-08-25 12:32:49 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-25 10:32:49 -0700 |
| commit | 87688b686bb4ede154d502cf9a342126c25789c0 (patch) | |
| tree | b60c579d806219049678f8eeb5440abba864a9d0 | |
| parent | 94dac3e880560cf37dcef9fc9b101afb150220fe (diff) | |
Mark lua setjmp/longjmp for powerpc weak
Linux already defines setjmp/longjmp for powerpc, which leads to
duplicate symbols in a statically linked build.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Sterlng Jensen <[email protected]>
Closes #10795
| -rw-r--r-- | module/lua/setjmp/setjmp_ppc.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/module/lua/setjmp/setjmp_ppc.S b/module/lua/setjmp/setjmp_ppc.S index f787ef349..72aa5d5ab 100644 --- a/module/lua/setjmp/setjmp_ppc.S +++ b/module/lua/setjmp/setjmp_ppc.S @@ -56,7 +56,7 @@ #define ENTRY(name) \ .align 2 ; \ .type name,@function; \ - .globl name; \ + .weak name; \ name: #else /* PPC64_ELF_ABI_v1 */ @@ -65,8 +65,8 @@ name: #define GLUE(a,b) XGLUE(a,b) #define ENTRY(name) \ .align 2 ; \ - .globl name; \ - .globl GLUE(.,name); \ + .weak name; \ + .weak GLUE(.,name); \ .pushsection ".opd","aw"; \ name: \ .quad GLUE(.,name); \ @@ -83,8 +83,8 @@ GLUE(.,name): #define ENTRY(name) \ .text; \ .p2align 4; \ - .globl name; \ - .type name,@function; \ + .weak name; \ + .type name,@function; \ name: #endif /* __powerpc64__ */ |