aes-sparcv9.pl: clean up regexp

[openssl.git] / crypto / aes / asm / aes-sparcv9.pl

diff --git a/crypto/aes/asm/aes-sparcv9.pl b/crypto/aes/asm/aes-sparcv9.pl
index 76828ee7673571a0d4fe3491bb6fa00e4be907d8..403c4d12904873e1eda4afe06d89272dac7788f6 100755 (executable)
--- a/crypto/aes/asm/aes-sparcv9.pl
+++ b/crypto/aes/asm/aes-sparcv9.pl
@@ -523,7 +523,7 @@ AES_encrypt:
        ld      [%i0+12],%o3
 
 1:     call    .+8
-       sub     %o7,1b-AES_Te,%o4
+       add     %o7,AES_Te-1b,%o4
        call    _sparcv9_AES_encrypt
        mov     %i2,%o5
 
@@ -583,7 +583,7 @@ AES_encrypt:
        or      %l4,%l6,%o3
 
 1:     call    .+8
-       sub     %o7,1b-AES_Te,%o4
+       add     %o7,AES_Te-1b,%o4
        call    _sparcv9_AES_encrypt
        mov     %i2,%o5
 
@@ -1069,7 +1069,7 @@ AES_decrypt:
        ld      [%i0+12],%o3
 
 1:     call    .+8
-       sub     %o7,1b-AES_Td,%o4
+       add     %o7,AES_Td-1b,%o4
        call    _sparcv9_AES_decrypt
        mov     %i2,%o5
 
@@ -1129,7 +1129,7 @@ AES_decrypt:
        or      %l4,%l6,%o3
 
 1:     call    .+8
-       sub     %o7,1b-AES_Td,%o4
+       add     %o7,AES_Td-1b,%o4
        call    _sparcv9_AES_decrypt
        mov     %i2,%o5
 
@@ -1176,6 +1176,7 @@ ___
 # As UltraSPARC T1, a.k.a. Niagara, has shared FPU, FP nops can have
 # undesired effect, so just omit them and sacrifice some portion of
 # percent in performance...
-$code =~ s/fmovs.*$//gem;
+$code =~ s/fmovs.*$//gm;
 
 print $code;
+close STDOUT;  # ensure flush