Missing .rodata for AVX2/AVX512 codepaths

This is a follow-up to #23997

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25340)

diff --git a/crypto/bn/asm/rsaz-2k-avx512.pl b/crypto/bn/asm/rsaz-2k-avx512.pl
index 7ee02778df5553c725517dac226ea04d08756865..24fcebcfd1cdd9de66f04b2a9fe367d6a0de9dfc 100644 (file)
--- a/crypto/bn/asm/rsaz-2k-avx512.pl
+++ b/crypto/bn/asm/rsaz-2k-avx512.pl
@@ -393,7 +393,7 @@ $code.=<<___;
 ___
 
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lmask52x4:
     .quad   0xfffffffffffff
@@ -589,7 +589,7 @@ $code.=<<___;
 .size   ossl_extract_multiplier_2x20_win5, .-ossl_extract_multiplier_2x20_win5
 ___
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lones:
     .quad   1,1,1,1

diff --git a/crypto/bn/asm/rsaz-3k-avx512.pl b/crypto/bn/asm/rsaz-3k-avx512.pl
index 8ed5496479b2243295bc825e0f28dce06c186978..e8713864e874412ba534c0889e3af082d042bcee 100644 (file)
--- a/crypto/bn/asm/rsaz-3k-avx512.pl
+++ b/crypto/bn/asm/rsaz-3k-avx512.pl
@@ -485,7 +485,7 @@ $code.=<<___;
 ___
 
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lmask52x4:
     .quad   0xfffffffffffff
@@ -730,7 +730,7 @@ $code.=<<___;
 .size   ossl_extract_multiplier_2x30_win5, .-ossl_extract_multiplier_2x30_win5
 ___
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lones:
     .quad   1,1,1,1

diff --git a/crypto/bn/asm/rsaz-4k-avx512.pl b/crypto/bn/asm/rsaz-4k-avx512.pl
index 8c59b77f7787ccf64eba8d102dc9c1d2c111e695..381c08b0fb5b0f02494ee2911b7bb88a1d386056 100644 (file)
--- a/crypto/bn/asm/rsaz-4k-avx512.pl
+++ b/crypto/bn/asm/rsaz-4k-avx512.pl
@@ -526,7 +526,7 @@ $code.=<<___;
 ___
 
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lmask52x4:
     .quad   0xfffffffffffff
@@ -786,7 +786,7 @@ $code.=<<___;
 .size   ossl_extract_multiplier_2x40_win5, .-ossl_extract_multiplier_2x40_win5
 ___
 $code.=<<___;
-.data
+.section .rodata align=32
 .align 32
 .Lones:
     .quad   1,1,1,1

diff --git a/crypto/bn/asm/rsaz-avx2.pl b/crypto/bn/asm/rsaz-avx2.pl
index 3d0e342a6b8cbb63957eeea5769ff3ebf700cd10..78e0ca21d3469a89a1ca867371458e9c7d6d6310 100755 (executable)
--- a/crypto/bn/asm/rsaz-avx2.pl
+++ b/crypto/bn/asm/rsaz-avx2.pl
@@ -1779,6 +1779,7 @@ $code.=<<___;
        ret
 .size  rsaz_avx2_eligible,.-rsaz_avx2_eligible
 
+.section .rodata align=64
 .align 64
 .Land_mask:
        .quad   0x1fffffff,0x1fffffff,0x1fffffff,0x1fffffff
@@ -1790,6 +1791,7 @@ $code.=<<___;
        .long   0,0,0,0, 1,1,1,1
        .long   2,2,2,2, 3,3,3,3
        .long   4,4,4,4, 4,4,4,4
+.previous
 .align 64
 ___
 

diff --git a/crypto/modes/asm/aes-gcm-avx512.pl b/crypto/modes/asm/aes-gcm-avx512.pl
index e150c9aa052caa74558321fecfefafd23e48e17f..d6e5b21b360f40f03a104ef85ee21851e18305d3 100644 (file)
--- a/crypto/modes/asm/aes-gcm-avx512.pl
+++ b/crypto/modes/asm/aes-gcm-avx512.pl
@@ -4812,7 +4812,7 @@ ___
 }
 
 $code .= <<___;
-.data
+.section .rodata align=16
 .align 16
 POLY:   .quad     0x0000000000000001, 0xC200000000000000