Do not output SOM-specific directives.

diff --git a/lib/libcrypto/aes/asm/aes-parisc.pl b/lib/libcrypto/aes/asm/aes-parisc.pl
index 714dcfb..f12a1c1 100644 (file)
--- a/lib/libcrypto/aes/asm/aes-parisc.pl
+++ b/lib/libcrypto/aes/asm/aes-parisc.pl
@@ -64,8 +64,12 @@ $rounds="%r29";
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT AES_encrypt,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR
        .ALIGN  64
@@ -1002,6 +1006,8 @@ L\$AES_Td
        .BYTE   0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
        .BYTE   0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26
        .BYTE   0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
+
+       .data
        .STRINGZ "AES for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 

diff --git a/lib/libcrypto/bn/asm/parisc-mont.pl b/lib/libcrypto/bn/asm/parisc-mont.pl
index c38cebd..baa1967 100644 (file)
--- a/lib/libcrypto/bn/asm/parisc-mont.pl
+++ b/lib/libcrypto/bn/asm/parisc-mont.pl
@@ -126,8 +126,12 @@ $fni="%fr9";       $fnm0="%fr10";  $fnm1="%fr11";
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT bn_mul_mont,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR
        .ALIGN  64
@@ -875,6 +879,8 @@ L\$abort
        .EXIT
        $POPMB  -$FRAME(%sp),%r3
        .PROCEND
+
+       .data
        .STRINGZ "Montgomery Multiplication for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 \f

diff --git a/lib/libcrypto/modes/asm/ghash-parisc.pl b/lib/libcrypto/modes/asm/ghash-parisc.pl
index 535af86..38c5e00 100644 (file)
--- a/lib/libcrypto/modes/asm/ghash-parisc.pl
+++ b/lib/libcrypto/modes/asm/ghash-parisc.pl
@@ -81,8 +81,12 @@ $rem2="%r6"; # used in PA-RISC 2.0 code
 
 $code.=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT gcm_gmult_4bit,ENTRY,ARGW0=GR,ARGW1=GR
        .ALIGN  64
@@ -617,6 +621,8 @@ L\$rem_4bit
        .WORD   `0x7080<<16`,0,`0x6CA0<<16`,0,`0x48C0<<16`,0,`0x54E0<<16`,0
        .WORD   `0xE100<<16`,0,`0xFD20<<16`,0,`0xD940<<16`,0,`0xC560<<16`,0
        .WORD   `0x9180<<16`,0,`0x8DA0<<16`,0,`0xA9C0<<16`,0,`0xB5E0<<16`,0
+
+       .data
        .STRINGZ "GHASH for PA-RISC, GRYPTOGAMS by <appro\@openssl.org>"
        .ALIGN  64
 ___

diff --git a/lib/libcrypto/pariscid.pl b/lib/libcrypto/pariscid.pl
index 34c8619..da74a28 100644 (file)
--- a/lib/libcrypto/pariscid.pl
+++ b/lib/libcrypto/pariscid.pl
@@ -20,8 +20,12 @@ $rv="%r28";
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT OPENSSL_cpuid_setup,ENTRY
        .ALIGN  8

diff --git a/lib/libcrypto/rc4/asm/rc4-parisc.pl b/lib/libcrypto/rc4/asm/rc4-parisc.pl
index ad7e656..9eca699 100644 (file)
--- a/lib/libcrypto/rc4/asm/rc4-parisc.pl
+++ b/lib/libcrypto/rc4/asm/rc4-parisc.pl
@@ -137,8 +137,12 @@ ___
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT RC4,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR
 RC4
@@ -301,6 +305,8 @@ L\$pic
        .EXIT
        ldo     L\$opts-L\$pic(%r28),%r28
        .PROCEND
+
+       .data
        .ALIGN  8
 L\$opts
        .STRINGZ "rc4(4x,`$SZ==1?"char":"int"`)"

diff --git a/lib/libcrypto/sha/asm/sha1-parisc.pl b/lib/libcrypto/sha/asm/sha1-parisc.pl
index 6e5a328..6cb4656 100644 (file)
--- a/lib/libcrypto/sha/asm/sha1-parisc.pl
+++ b/lib/libcrypto/sha/asm/sha1-parisc.pl
@@ -146,8 +146,12 @@ ___
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT sha1_block_data_order,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR
 sha1_block_data_order
@@ -250,6 +254,8 @@ $code.=<<___;
        .EXIT
        $POPMB  -$FRAME(%sp),%r3
        .PROCEND
+
+       .data
        .STRINGZ "SHA1 block transform for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 

diff --git a/lib/libcrypto/sha/asm/sha512-parisc.pl b/lib/libcrypto/sha/asm/sha512-parisc.pl
index fc0e15b..578e3f4 100755 (executable)
--- a/lib/libcrypto/sha/asm/sha512-parisc.pl
+++ b/lib/libcrypto/sha/asm/sha512-parisc.pl
@@ -159,8 +159,12 @@ ___
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .ALIGN  64
 L\$table
@@ -682,6 +686,8 @@ $code.=<<___;
        .EXIT
        $POPMB  -$FRAME(%sp),%r3
        .PROCEND
+
+       .data
        .STRINGZ "SHA`64*$SZ` block transform for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 

diff --git a/lib/libssl/src/crypto/aes/asm/aes-parisc.pl b/lib/libssl/src/crypto/aes/asm/aes-parisc.pl
index 714dcfb..f12a1c1 100644 (file)
--- a/lib/libssl/src/crypto/aes/asm/aes-parisc.pl
+++ b/lib/libssl/src/crypto/aes/asm/aes-parisc.pl
@@ -64,8 +64,12 @@ $rounds="%r29";
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT AES_encrypt,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR
        .ALIGN  64
@@ -1002,6 +1006,8 @@ L\$AES_Td
        .BYTE   0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61
        .BYTE   0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26
        .BYTE   0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d
+
+       .data
        .STRINGZ "AES for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 

diff --git a/lib/libssl/src/crypto/bn/asm/parisc-mont.pl b/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
index c38cebd..baa1967 100644 (file)
--- a/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
+++ b/lib/libssl/src/crypto/bn/asm/parisc-mont.pl
@@ -126,8 +126,12 @@ $fni="%fr9";       $fnm0="%fr10";  $fnm1="%fr11";
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT bn_mul_mont,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR
        .ALIGN  64
@@ -875,6 +879,8 @@ L\$abort
        .EXIT
        $POPMB  -$FRAME(%sp),%r3
        .PROCEND
+
+       .data
        .STRINGZ "Montgomery Multiplication for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 \f

diff --git a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
index 535af86..38c5e00 100644 (file)
--- a/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
+++ b/lib/libssl/src/crypto/modes/asm/ghash-parisc.pl
@@ -81,8 +81,12 @@ $rem2="%r6"; # used in PA-RISC 2.0 code
 
 $code.=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT gcm_gmult_4bit,ENTRY,ARGW0=GR,ARGW1=GR
        .ALIGN  64
@@ -617,6 +621,8 @@ L\$rem_4bit
        .WORD   `0x7080<<16`,0,`0x6CA0<<16`,0,`0x48C0<<16`,0,`0x54E0<<16`,0
        .WORD   `0xE100<<16`,0,`0xFD20<<16`,0,`0xD940<<16`,0,`0xC560<<16`,0
        .WORD   `0x9180<<16`,0,`0x8DA0<<16`,0,`0xA9C0<<16`,0,`0xB5E0<<16`,0
+
+       .data
        .STRINGZ "GHASH for PA-RISC, GRYPTOGAMS by <appro\@openssl.org>"
        .ALIGN  64
 ___

diff --git a/lib/libssl/src/crypto/pariscid.pl b/lib/libssl/src/crypto/pariscid.pl
index 34c8619..da74a28 100644 (file)
--- a/lib/libssl/src/crypto/pariscid.pl
+++ b/lib/libssl/src/crypto/pariscid.pl
@@ -20,8 +20,12 @@ $rv="%r28";
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT OPENSSL_cpuid_setup,ENTRY
        .ALIGN  8

diff --git a/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl b/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl
index ad7e656..9eca699 100644 (file)
--- a/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl
+++ b/lib/libssl/src/crypto/rc4/asm/rc4-parisc.pl
@@ -137,8 +137,12 @@ ___
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT RC4,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR,ARGW3=GR
 RC4
@@ -301,6 +305,8 @@ L\$pic
        .EXIT
        ldo     L\$opts-L\$pic(%r28),%r28
        .PROCEND
+
+       .data
        .ALIGN  8
 L\$opts
        .STRINGZ "rc4(4x,`$SZ==1?"char":"int"`)"

diff --git a/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl b/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl
index 6e5a328..6cb4656 100644 (file)
--- a/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl
+++ b/lib/libssl/src/crypto/sha/asm/sha1-parisc.pl
@@ -146,8 +146,12 @@ ___
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .EXPORT sha1_block_data_order,ENTRY,ARGW0=GR,ARGW1=GR,ARGW2=GR
 sha1_block_data_order
@@ -250,6 +254,8 @@ $code.=<<___;
        .EXIT
        $POPMB  -$FRAME(%sp),%r3
        .PROCEND
+
+       .data
        .STRINGZ "SHA1 block transform for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___
 

diff --git a/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl b/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
index fc0e15b..578e3f4 100755 (executable)
--- a/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
+++ b/lib/libssl/src/crypto/sha/asm/sha512-parisc.pl
@@ -159,8 +159,12 @@ ___
 
 $code=<<___;
        .LEVEL  $LEVEL
+#if 0
        .SPACE  \$TEXT\$
        .SUBSPA \$CODE\$,QUAD=0,ALIGN=8,ACCESS=0x2C,CODE_ONLY
+#else
+       .text
+#endif
 
        .ALIGN  64
 L\$table
@@ -682,6 +686,8 @@ $code.=<<___;
        .EXIT
        $POPMB  -$FRAME(%sp),%r3
        .PROCEND
+
+       .data
        .STRINGZ "SHA`64*$SZ` block transform for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>"
 ___