Import ceph 15.2.8

[ceph.git] / ceph / src / isa-l / raid / raid_multibinary.asm

diff --git a/ceph/src/isa-l/raid/raid_multibinary.asm b/ceph/src/isa-l/raid/raid_multibinary.asm
index 72ef5d40d595e29af38e88e73140ac5da968b56c..318062774939d2b23f4f219c48dc44efd17c277c 100644 (file)
--- a/ceph/src/isa-l/raid/raid_multibinary.asm
+++ b/ceph/src/isa-l/raid/raid_multibinary.asm
@@ -27,12 +27,6 @@
 ;  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-%ifidn __OUTPUT_FORMAT__, elf64
-%define WRT_OPT         wrt ..plt
-%else
-%define WRT_OPT
-%endif
-
 %include "reg_sizes.asm"
 %include "multibinary.asm"
 
@@ -62,13 +56,9 @@ extern xor_check_sse
 mbin_interface xor_gen
 mbin_interface pq_gen
 
-%ifdef HAVE_AS_KNOWS_AVX512
- mbin_dispatch_init6 xor_gen, xor_gen_base, xor_gen_sse, xor_gen_avx, xor_gen_avx, xor_gen_avx512
- mbin_dispatch_init6 pq_gen, pq_gen_base, pq_gen_sse, pq_gen_avx, pq_gen_avx2, pq_gen_avx512
-%else
- mbin_dispatch_init5 xor_gen, xor_gen_base, xor_gen_sse, xor_gen_avx, xor_gen_avx
- mbin_dispatch_init5 pq_gen, pq_gen_base, pq_gen_sse, pq_gen_avx, pq_gen_avx2
-%endif
+
+mbin_dispatch_init6 xor_gen, xor_gen_base, xor_gen_sse, xor_gen_avx, xor_gen_avx, xor_gen_avx512
+mbin_dispatch_init6 pq_gen, pq_gen_base, pq_gen_sse, pq_gen_avx, pq_gen_avx2, pq_gen_avx512
 
 section .data
 
@@ -82,7 +72,7 @@ section .text
 ;;;;
 ; pq_check multibinary function
 ;;;;
-global pq_check:function
+global pq_check:ISAL_SYM_TYPE_FUNCTION
 pq_check_mbinit:
        call    pq_check_dispatch_init
 pq_check:
@@ -114,7 +104,7 @@ pq_check_dispatch_init:
 ;;;;
 ; xor_check multibinary function
 ;;;;
-global xor_check:function
+global xor_check:ISAL_SYM_TYPE_FUNCTION
 xor_check_mbinit:
        call    xor_check_dispatch_init
 xor_check: