summaryrefslogtreecommitdiffstats
path: root/crypto/aes
diff options
context:
space:
mode:
authorTomas Mraz <tomas@openssl.org>2021-07-07 17:47:06 +0200
committerTomas Mraz <tomas@openssl.org>2021-07-15 09:33:04 +0200
commit52f7e44ec88a4d803dc9783cd7c71f87014ae3ee (patch)
treeb49310dc3808ba0e9130e6c148ae85d3479a9856 /crypto/aes
parent8e94c51b3279f7faae9161df5112414f915cd9f3 (diff)
Split bignum code out of the sparcv9cap.c
Fixes #15978 Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16019)
Diffstat (limited to 'crypto/aes')
-rwxr-xr-xcrypto/aes/asm/aes-sparcv9.pl5
-rw-r--r--crypto/aes/asm/aesfx-sparcv9.pl5
-rw-r--r--crypto/aes/asm/aest4-sparcv9.pl5
3 files changed, 12 insertions, 3 deletions
diff --git a/crypto/aes/asm/aes-sparcv9.pl b/crypto/aes/asm/aes-sparcv9.pl
index 9b9a795dbf..cb17a75f24 100755
--- a/crypto/aes/asm/aes-sparcv9.pl
+++ b/crypto/aes/asm/aes-sparcv9.pl
@@ -82,7 +82,10 @@ sub _data_word()
}
$code.=<<___;
-#include "sparc_arch.h"
+#ifndef __ASSEMBLER__
+# define __ASSEMBLER__ 1
+#endif
+#include "crypto/sparc_arch.h"
#ifdef __arch64__
.register %g2,#scratch
diff --git a/crypto/aes/asm/aesfx-sparcv9.pl b/crypto/aes/asm/aesfx-sparcv9.pl
index b40f3919b4..86f2c442ed 100644
--- a/crypto/aes/asm/aesfx-sparcv9.pl
+++ b/crypto/aes/asm/aesfx-sparcv9.pl
@@ -39,7 +39,10 @@ $output = pop and open STDOUT,">$output";
my ($inp,$out,$key,$rounds,$tmp,$mask) = map("%o$_",(0..5));
$code.=<<___;
-#include "sparc_arch.h"
+#ifndef __ASSEMBLER__
+# define __ASSEMBLER__ 1
+#endif
+#include "crypto/sparc_arch.h"
#define LOCALS (STACK_BIAS+STACK_FRAME)
diff --git a/crypto/aes/asm/aest4-sparcv9.pl b/crypto/aes/asm/aest4-sparcv9.pl
index 6b7a6eb403..bb73f24915 100644
--- a/crypto/aes/asm/aest4-sparcv9.pl
+++ b/crypto/aes/asm/aest4-sparcv9.pl
@@ -91,7 +91,10 @@ $::evp=1; # if $evp is set to 0, script generates module with
my ($inp,$out,$key,$rounds,$tmp,$mask)=map("%o$_",(0..5));
$code.=<<___;
-#include "sparc_arch.h"
+#ifndef __ASSEMBLER__
+# define __ASSEMBLER__ 1
+#endif
+#include "crypto/sparc_arch.h"
#ifdef __arch64__
.register %g2,#scratch