diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-06-24 13:29:29 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-06-25 16:45:48 +0200 |
| commit | 1753d1237429bace72a944f7654ce4b1c4364f60 (patch) | |
| tree | 138ed7f4272c857f387d88b6dc5bae575a1c2f83 /crypto/aes | |
| parent | 8d58f0171e743ebda2b676016800f0a4cd66a1da (diff) | |
PA-RISC assembly pack: make it work with GNU assembler for HP-UX.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6583)
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/asm/aes-parisc.pl | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/aes/asm/aes-parisc.pl b/crypto/aes/asm/aes-parisc.pl index b688ab3050..93ed09c30a 100644 --- a/crypto/aes/asm/aes-parisc.pl +++ b/crypto/aes/asm/aes-parisc.pl @@ -1012,6 +1012,11 @@ L\$AES_Td .STRINGZ "AES for PA-RISC, CRYPTOGAMS by <appro\@openssl.org>" ___ +if (`$ENV{CC} -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1` + =~ /GNU assembler/) { + $gnuas = 1; +} + foreach (split("\n",$code)) { s/\`([^\`]*)\`/eval $1/ge; @@ -1022,8 +1027,12 @@ foreach (split("\n",$code)) { $SIZE_T==4 ? sprintf("extru%s,%d,8,",$1,31-$2) : sprintf("extrd,u%s,%d,8,",$1,63-$2)/e; + s/(\.LEVEL\s+2\.0)W/$1w/ if ($gnuas && $SIZE_T==8); + s/\.SPACE\s+\$TEXT\$/.text/ if ($gnuas && $SIZE_T==8); + s/\.SUBSPA.*// if ($gnuas && $SIZE_T==8); s/,\*/,/ if ($SIZE_T==4); s/\bbv\b(.*\(%r2\))/bve$1/ if ($SIZE_T==8); + print $_,"\n"; } close STDOUT; |