Move constants out of text segment into rodata to prepare for xonly support

on amd64.  no pic handling is neccessary since amd64 has full reach.
ok kettenis

2 files changed, 6 insertions, 1 deletions

diff --git a/src/lib/libcrypto/sha/asm/sha1-x86_64.pl b/src/lib/libcrypto/sha/asm/sha1-x86_64.pl
index cc8ef5337d..0abbbab6ba 100755
--- a/src/lib/libcrypto/sha/asm/sha1-x86_64.pl
+++ b/src/lib/libcrypto/sha/asm/sha1-x86_64.pl
@@ -1071,6 +1071,7 @@ $code.=<<___;
 ___
 }
 $code.=<<___;
+.rodata
 .align  64
 K_XX_XX:
 .long   0x5a827999,0x5a827999,0x5a827999,0x5a827999     # K_00_19
@@ -1078,10 +1079,10 @@ K_XX_XX:
 .long   0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc,0x8f1bbcdc     # K_40_59
 .long   0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6     # K_60_79
 .long   0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f     # pbswap mask
+.previous
 ___
 }}}
 $code.=<<___;
-.asciz  "SHA1 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
 .align  64
 ___
 
diff --git a/src/lib/libcrypto/sha/asm/sha512-x86_64.pl b/src/lib/libcrypto/sha/asm/sha512-x86_64.pl
index bc4b2e7487..6698b1d406 100755
--- a/src/lib/libcrypto/sha/asm/sha512-x86_64.pl
+++ b/src/lib/libcrypto/sha/asm/sha512-x86_64.pl
@@ -269,6 +269,7 @@ ___
 
 if ($SZ==4) {
 $code.=<<___;
+.rodata
 .align  64
 .type   $TABLE,\@object
 $TABLE:
@@ -288,9 +289,11 @@ $TABLE:
         .long   0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3
         .long   0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208
         .long   0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
+.previous
 ___
 } else {
 $code.=<<___;
+.rodata
 .align  64
 .type   $TABLE,\@object
 $TABLE:
@@ -334,6 +337,7 @@ $TABLE:
         .quad   0x3c9ebe0a15c9bebc,0x431d67c49c100d4c
         .quad   0x4cc5d4becb3e42b6,0x597f299cfc657e2a
         .quad   0x5fcb6fab3ad6faec,0x6c44198c4a475817
+.previous
 ___
 }