From 8861777e025998cc80bb9e39e88a332e8aec2f26 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 30 Oct 2023 22:00:12 -0500 Subject: [PATCH 2/4] Revert "Use explicit .text instead of .previous to please Windows/MinGW on amd64" This reverts commit e8192f57c4e5910ce7badced4a24c8827810d567. --- src/lib/libcrypto/aes/asm/aes-x86_64.pl | 2 +- src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl | 2 +- src/lib/libcrypto/aes/asm/aesni-x86_64.pl | 2 +- src/lib/libcrypto/aes/asm/bsaes-x86_64.pl | 2 +- src/lib/libcrypto/aes/asm/vpaes-x86_64.pl | 2 +- src/lib/libcrypto/bn/asm/x86_64-mont5.pl | 2 +- src/lib/libcrypto/camellia/asm/cmll-x86_64.pl | 2 +- src/lib/libcrypto/modes/asm/ghash-x86_64.pl | 2 +- src/lib/libcrypto/sha/asm/sha1-x86_64.pl | 2 +- src/lib/libcrypto/sha/asm/sha512-x86_64.pl | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/lib/libcrypto/aes/asm/aes-x86_64.pl b/src/lib/libcrypto/aes/asm/aes-x86_64.pl index b7399b552..2986a9fcc 100755 --- a/src/lib/libcrypto/aes/asm/aes-x86_64.pl +++ b/src/lib/libcrypto/aes/asm/aes-x86_64.pl @@ -2535,7 +2535,7 @@ $code.=<<___; .long 0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe .long 0x1b1b1b1b, 0x1b1b1b1b, 0, 0 .align 64 -.text +.previous ___ # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl b/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl index bafa906a0..8a428c9b1 100644 --- a/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl +++ b/src/lib/libcrypto/aes/asm/aesni-sha1-x86_64.pl @@ -1084,7 +1084,7 @@ K_XX_XX: .long 0xca62c1d6,0xca62c1d6,0xca62c1d6,0xca62c1d6 # K_60_79 .long 0x00010203,0x04050607,0x08090a0b,0x0c0d0e0f # pbswap mask .align 64 -.text +.previous ___ # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl index e662fbc7c..09612b1f8 100644 --- a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl +++ b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl @@ -2732,7 +2732,7 @@ $code.=<<___; .Lxts_magic: .long 0x87,0,1,0 .align 64 -.text +.previous ___ # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/src/lib/libcrypto/aes/asm/bsaes-x86_64.pl b/src/lib/libcrypto/aes/asm/bsaes-x86_64.pl index 20e9e1f71..347f4c302 100644 --- a/src/lib/libcrypto/aes/asm/bsaes-x86_64.pl +++ b/src/lib/libcrypto/aes/asm/bsaes-x86_64.pl @@ -2937,7 +2937,7 @@ _bsaes_const: .quad 0x6363636363636363, 0x6363636363636363 .align 64 .size _bsaes_const,.-_bsaes_const -.text +.previous ___ # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/src/lib/libcrypto/aes/asm/vpaes-x86_64.pl b/src/lib/libcrypto/aes/asm/vpaes-x86_64.pl index 3ffb1a303..ad5fa7522 100644 --- a/src/lib/libcrypto/aes/asm/vpaes-x86_64.pl +++ b/src/lib/libcrypto/aes/asm/vpaes-x86_64.pl @@ -1063,7 +1063,7 @@ _vpaes_consts: .quad 0x12D7560F93441D00, 0xCA4B8159D8C58E9C .align 64 .size _vpaes_consts,.-_vpaes_consts -.text +.previous ___ if ($win64) { diff --git a/src/lib/libcrypto/bn/asm/x86_64-mont5.pl b/src/lib/libcrypto/bn/asm/x86_64-mont5.pl index 7b9c6df27..1c8aa255c 100755 --- a/src/lib/libcrypto/bn/asm/x86_64-mont5.pl +++ b/src/lib/libcrypto/bn/asm/x86_64-mont5.pl @@ -1037,7 +1037,7 @@ $code.=<<___; .Linc: .long 0,0, 1,1 .long 2,2, 2,2 -.text +.previous ___ # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl index 586e5d6e9..c16725f5c 100644 --- a/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl +++ b/src/lib/libcrypto/camellia/asm/cmll-x86_64.pl @@ -625,7 +625,7 @@ $_ivp="40(%rsp)"; $_rsp="48(%rsp)"; $code.=<<___; -.text +.previous .globl Camellia_cbc_encrypt .type Camellia_cbc_encrypt,\@function,6 .align 16 diff --git a/src/lib/libcrypto/modes/asm/ghash-x86_64.pl b/src/lib/libcrypto/modes/asm/ghash-x86_64.pl index 71d0822ac..bce62947f 100644 --- a/src/lib/libcrypto/modes/asm/ghash-x86_64.pl +++ b/src/lib/libcrypto/modes/asm/ghash-x86_64.pl @@ -670,7 +670,7 @@ $code.=<<___; .value 0xB5E0,0xB422,0xB664,0xB7A6,0xB2E8,0xB32A,0xB16C,0xB0AE .value 0xBBF0,0xBA32,0xB874,0xB9B6,0xBCF8,0xBD3A,0xBF7C,0xBEBE .align 64 -.text +.previous ___ # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame, diff --git a/src/lib/libcrypto/sha/asm/sha1-x86_64.pl b/src/lib/libcrypto/sha/asm/sha1-x86_64.pl index 43eee73c4..1ec7f609a 100755 --- a/src/lib/libcrypto/sha/asm/sha1-x86_64.pl +++ b/src/lib/libcrypto/sha/asm/sha1-x86_64.pl @@ -1079,7 +1079,7 @@ 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 -.text +.previous ___ }}} $code.=<<___; diff --git a/src/lib/libcrypto/sha/asm/sha512-x86_64.pl b/src/lib/libcrypto/sha/asm/sha512-x86_64.pl index 0517eab66..1a7d9bf2d 100755 --- a/src/lib/libcrypto/sha/asm/sha512-x86_64.pl +++ b/src/lib/libcrypto/sha/asm/sha512-x86_64.pl @@ -289,7 +289,7 @@ $TABLE: .long 0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3 .long 0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208 .long 0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2 -.text +.previous ___ } else { $code.=<<___; @@ -337,7 +337,7 @@ $TABLE: .quad 0x3c9ebe0a15c9bebc,0x431d67c49c100d4c .quad 0x4cc5d4becb3e42b6,0x597f299cfc657e2a .quad 0x5fcb6fab3ad6faec,0x6c44198c4a475817 -.text +.previous ___ } -- 2.42.0