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/bn/asm/parisc-mont.pl | |
| 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/bn/asm/parisc-mont.pl')
| -rw-r--r-- | crypto/bn/asm/parisc-mont.pl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/crypto/bn/asm/parisc-mont.pl b/crypto/bn/asm/parisc-mont.pl index 78ab2dc30d..aa9f626ed2 100644 --- a/crypto/bn/asm/parisc-mont.pl +++ b/crypto/bn/asm/parisc-mont.pl @@ -984,6 +984,11 @@ sub assemble { ref($opcode) eq 'CODE' ? &$opcode($mod,$args) : "\t$mnemonic$mod\t$args"; } +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; # flip word order in 64-bit mode... @@ -991,7 +996,10 @@ foreach (split("\n",$code)) { # assemble 2.0 instructions in 32-bit mode... s/^\s+([a-z]+)([\S]*)\s+([\S]*)/&assemble($1,$2,$3)/e if ($BN_SZ==4); - s/\bbv\b/bve/gm if ($SIZE_T==8); + 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/\bbv\b/bve/ if ($SIZE_T==8); print $_,"\n"; } |