Move *_arch.h to include/arch

Move all the architecture specific header files under a single directory
in include/

Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
MergeDate: Sun May 10 09:53:34 2026
(Merged from https://github.com/openssl/openssl/pull/30751)

diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl
index 162eb5ce36c29f07e6e5c109093ef57ee2276974..641e45144eac27cc33c72ff443d0be4de377a36b 100644 (file)
--- a/crypto/aes/asm/aes-armv4.pl
+++ b/crypto/aes/asm/aes-armv4.pl
@@ -73,7 +73,7 @@ $rounds="r12";
 
 $code=<<___;
 #ifndef __KERNEL__
-# include "arm_arch.h"
+# include "arch/arm_arch.h"
 #else
 # define __ARM_ARCH__ __LINUX_ARM_ARCH__
 #endif

diff --git a/crypto/aes/asm/aes-mips.pl b/crypto/aes/asm/aes-mips.pl
index 6a37c1ce3f4e908d95b5f51bdc913fc410b8a90b..28ca4d028b9655d2faf50f02fb38c574410ddf99 100644 (file)
--- a/crypto/aes/asm/aes-mips.pl
+++ b/crypto/aes/asm/aes-mips.pl
@@ -107,7 +107,7 @@ my ($MSB,$LSB)=(0,3);       # automatically converted to little-endian
 $output and open STDOUT,">$output";
 
 $code.=<<___;
-#include "mips_arch.h"
+#include "arch/mips_arch.h"
 
 .text
 #if !defined(__mips_eabi) && (!defined(__vxworks) || defined(__pic__))

diff --git a/crypto/aes/asm/aes-s390x.pl b/crypto/aes/asm/aes-s390x.pl
index 073829cda45a1847c7636f319d998a673f52760a..66529ad732f5092444a54f5fa95a275ddf81bd6b 100644 (file)
--- a/crypto/aes/asm/aes-s390x.pl
+++ b/crypto/aes/asm/aes-s390x.pl
@@ -131,7 +131,7 @@ sub _data_word()
 }
 
 $code=<<___;
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 .text
 

diff --git a/crypto/aes/asm/aes-sha1-armv8.pl b/crypto/aes/asm/aes-sha1-armv8.pl
index eb6e16698a41e3a01e496c0d382f33e14640876c..e965811b718365c62a1a5eca252d30219269b85c 100644 (file)
--- a/crypto/aes/asm/aes-sha1-armv8.pl
+++ b/crypto/aes/asm/aes-sha1-armv8.pl
@@ -30,7 +30,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
 *STDOUT=*OUT;
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 /* These are offsets into the CIPH_DIGEST struct */
 #define CIPHER_KEY     0

diff --git a/crypto/aes/asm/aes-sha256-armv8.pl b/crypto/aes/asm/aes-sha256-armv8.pl
index 085319eaceb6364079b3b4886e9ba188ddb4e83f..f81f590090ab5c1d60f4b8b51be6d0e2a5afe8a6 100644 (file)
--- a/crypto/aes/asm/aes-sha256-armv8.pl
+++ b/crypto/aes/asm/aes-sha256-armv8.pl
@@ -30,7 +30,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
 *STDOUT=*OUT;
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 /* These are offsets into the CIPH_DIGEST struct */
 #define CIPHER_KEY     0

diff --git a/crypto/aes/asm/aes-sha512-armv8.pl b/crypto/aes/asm/aes-sha512-armv8.pl
index 3582bcfeef14b9599f0410be506a732aba73c5d2..bae8f31c446ef8d1489e8481da49bfba08aeb551 100644 (file)
--- a/crypto/aes/asm/aes-sha512-armv8.pl
+++ b/crypto/aes/asm/aes-sha512-armv8.pl
@@ -22,7 +22,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
 *STDOUT=*OUT;
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 /* These are offsets into the CIPH_DIGEST struct */
 #define CIPHER_KEY     0

diff --git a/crypto/aes/asm/aes-sparcv9.pl b/crypto/aes/asm/aes-sparcv9.pl
index 2a6fa6c96e66ec7d96ceae234e8a5e4be8dda3d2..9fbe7c7a7486e3a5fbe3e14c8313417d09fdb2a7 100755 (executable)
--- a/crypto/aes/asm/aes-sparcv9.pl
+++ b/crypto/aes/asm/aes-sparcv9.pl
@@ -85,7 +85,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/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 8a307e1f60ed30622e24291f4b3f360d6f520f97..d19efa2f928f38e9def9bdb513bb6edb851cf401 100644 (file)
--- a/crypto/aes/asm/aesfx-sparcv9.pl
+++ b/crypto/aes/asm/aesfx-sparcv9.pl
@@ -42,7 +42,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/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 c04b5f3cdaf87233c4f9efc16e6f7e9d7e7a48b0..d867db183b16c20247e61dfc70a8c7af11d8f945 100644 (file)
--- a/crypto/aes/asm/aest4-sparcv9.pl
+++ b/crypto/aes/asm/aest4-sparcv9.pl
@@ -94,7 +94,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/aes/asm/aesv8-armx.pl b/crypto/aes/asm/aesv8-armx.pl
index 82e60d788ec2147b898275c686f2963d2c5d8751..a9e272a91c056184f3f34abb4fb5c15737038a60 100755 (executable)
--- a/crypto/aes/asm/aesv8-armx.pl
+++ b/crypto/aes/asm/aesv8-armx.pl
@@ -75,7 +75,7 @@ $prefix="aes_v8";
 $_byte = ($flavour =~ /win/ ? "DCB" : ".byte");
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=7
 ___

diff --git a/crypto/aes/asm/bsaes-armv7.pl b/crypto/aes/asm/bsaes-armv7.pl
index edc01265f7cbf11cc6d4fae790b1a7fb3f9d11c8..ff9c2fa3b96e5c15bfce05872ec4ac4e5aab065f 100644 (file)
--- a/crypto/aes/asm/bsaes-armv7.pl
+++ b/crypto/aes/asm/bsaes-armv7.pl
@@ -706,7 +706,7 @@ ___
 
 $code.=<<___;
 #ifndef __KERNEL__
-# include "arm_arch.h"
+# include "arch/arm_arch.h"
 
 # define VFP_ABI_PUSH  vstmdb  sp!,{d8-d15}
 # define VFP_ABI_POP   vldmia  sp!,{d8-d15}

diff --git a/crypto/aes/asm/bsaes-armv8.pl b/crypto/aes/asm/bsaes-armv8.pl
index 912538622b3906e8439741db717f0d5387d39a8d..fa64865ba6d95144ac17c931f7f770c67815022c 100644 (file)
--- a/crypto/aes/asm/bsaes-armv8.pl
+++ b/crypto/aes/asm/bsaes-armv8.pl
@@ -56,7 +56,7 @@ __END__
 // up in Perl, and it is presented as pure assembly.
 
 
-#include "crypto/arm_arch.h"
+#include "arch/arm_arch.h"
 
 .text
 

diff --git a/crypto/aes/asm/vpaes-armv8.pl b/crypto/aes/asm/vpaes-armv8.pl
index 1e348aafc7edd257fa0b4c0694d9ccb337c878aa..e9bf163cac40a6d1fd6f1dce6bc8da3062e658fb 100755 (executable)
--- a/crypto/aes/asm/vpaes-armv8.pl
+++ b/crypto/aes/asm/vpaes-armv8.pl
@@ -53,7 +53,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
 *STDOUT=*OUT;
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .rodata
 

diff --git a/crypto/arm64cpuid.pl b/crypto/arm64cpuid.pl
index f38a64bc6bf674bb43bd58d16ba6466a03c235cb..d90289b6a926987e702001ae8571c6d22538408d 100755 (executable)
--- a/crypto/arm64cpuid.pl
+++ b/crypto/arm64cpuid.pl
@@ -22,7 +22,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
 *STDOUT=*OUT;
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .text
 .arch  armv8-a+crypto

diff --git a/crypto/armcap.c b/crypto/armcap.c
index e5ba2132ff713a2c28390bcebf0a2b94504555f5..cdb8336b13ab32b514d2e2d0d5ab83a34cf3b45b 100644 (file)
--- a/crypto/armcap.c
+++ b/crypto/armcap.c
@@ -23,7 +23,7 @@
 #else
 #include <unistd.h>
 #endif
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 #ifdef __aarch64__
 #include <stdint.h>
 #endif

diff --git a/crypto/armv4cpuid.pl b/crypto/armv4cpuid.pl
index e7273b33900bfb52fb2233bc230b26c5a0b6699f..9b6670e66dcefbc630f05c99bcbb51264da06cb0 100644 (file)
--- a/crypto/armv4cpuid.pl
+++ b/crypto/armv4cpuid.pl
@@ -22,7 +22,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
 *STDOUT=*OUT;
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__) && !defined(__APPLE__)
 .syntax        unified

diff --git a/crypto/bn/asm/armv4-gf2m.pl b/crypto/bn/asm/armv4-gf2m.pl
index 3332eb112a980e9e77670954796b1681a6eb5ba0..f722804b2f02d761e282cd91994f3f397a4dc290 100644 (file)
--- a/crypto/bn/asm/armv4-gf2m.pl
+++ b/crypto/bn/asm/armv4-gf2m.pl
@@ -57,7 +57,7 @@ if ($flavour && $flavour ne "void") {
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__)
 .syntax        unified

diff --git a/crypto/bn/asm/armv4-mont.pl b/crypto/bn/asm/armv4-mont.pl
index ad474e38997b5b24f48d68f13a18e08a90f66b1d..9429440e87d73406e68da9c130a0606efd30de65 100644 (file)
--- a/crypto/bn/asm/armv4-mont.pl
+++ b/crypto/bn/asm/armv4-mont.pl
@@ -97,7 +97,7 @@ $_n0="$num,#14*4";
 $_num="$num,#15*4";    $_bpend=$_num;
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__)
 .syntax        unified

diff --git a/crypto/bn/asm/armv8-mont.pl b/crypto/bn/asm/armv8-mont.pl
index 32f2821d3b7ea0c05ea3441a357ce14d8fa6e69b..9f0495f270b20c19fafd4d0fcfd368fd0ea78821 100755 (executable)
--- a/crypto/bn/asm/armv8-mont.pl
+++ b/crypto/bn/asm/armv8-mont.pl
@@ -67,7 +67,7 @@ $n0="x4";     # const BN_ULONG *n0,
 $num="x5";     # int num);
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 #ifndef        __KERNEL__
 .extern OPENSSL_armv8_rsa_neonized
 .hidden OPENSSL_armv8_rsa_neonized

diff --git a/crypto/bn/asm/mips-mont.pl b/crypto/bn/asm/mips-mont.pl
index b3740b75279f87f3cb45936f22e710b4fe6d9c23..b26989271f622cd8c557cea998481387e1228c92 100644 (file)
--- a/crypto/bn/asm/mips-mont.pl
+++ b/crypto/bn/asm/mips-mont.pl
@@ -124,7 +124,7 @@ $m1=$s11;
 $FRAMESIZE=14;
 
 $code=<<___;
-#include "mips_arch.h"
+#include "arch/mips_arch.h"
 
 .text
 

diff --git a/crypto/bn/asm/mips.pl b/crypto/bn/asm/mips.pl
index 3240a3e398a1c8a681a8c858bac795e01d8d9713..0e7046ac48a0091e7208e7eb5bb8909e87f6639b 100644 (file)
--- a/crypto/bn/asm/mips.pl
+++ b/crypto/bn/asm/mips.pl
@@ -111,7 +111,7 @@ $gp=$v1 if ($flavour =~ /nubi/i);
 $minus4=$v1;
 
 $code.=<<___;
-#include "mips_arch.h"
+#include "arch/mips_arch.h"
 
 #if defined(_MIPS_ARCH_MIPS64R6)
 # define ddivu(rs,rt)

diff --git a/crypto/bn/asm/sparct4-mont.pl b/crypto/bn/asm/sparct4-mont.pl
index 8a3bedc9af420c0acef2fed5bc3c2c49299f540a..1d2747c4ca94bd38e13f7b9f9db0a536a79a12d4 100755 (executable)
--- a/crypto/bn/asm/sparct4-mont.pl
+++ b/crypto/bn/asm/sparct4-mont.pl
@@ -89,7 +89,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/bn/asm/sparcv9-gf2m.pl b/crypto/bn/asm/sparcv9-gf2m.pl
index 7beee807f486d4445a5b9a0ab9ce3db06dcbe2cb..2cd0498aa1c8ed6d797eb7b5946682e730d7064a 100644 (file)
--- a/crypto/bn/asm/sparcv9-gf2m.pl
+++ b/crypto/bn/asm/sparcv9-gf2m.pl
@@ -41,7 +41,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/bn/asm/sparcv9-mont.pl b/crypto/bn/asm/sparcv9-mont.pl
index ce7a8651fc5b3230dbb3ae8695b597a361c44fc8..4578f523a681db94a26b12e031cf3800942699b2 100644 (file)
--- a/crypto/bn/asm/sparcv9-mont.pl
+++ b/crypto/bn/asm/sparcv9-mont.pl
@@ -86,7 +86,7 @@ $code=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 .section       ".text",#alloc,#execinstr
 

diff --git a/crypto/bn/asm/sparcv9a-mont.pl b/crypto/bn/asm/sparcv9a-mont.pl
index f60854e95ff2531976135328bf3ae148598f947f..81fc8076256346fef96e01ce51027088157b9b6a 100755 (executable)
--- a/crypto/bn/asm/sparcv9a-mont.pl
+++ b/crypto/bn/asm/sparcv9a-mont.pl
@@ -129,7 +129,7 @@ $code=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 .section       ".text",#alloc,#execinstr
 

diff --git a/crypto/bn/asm/vis3-mont.pl b/crypto/bn/asm/vis3-mont.pl
index 5f8304c0ea0545aed92ac627576338b4550b488c..65a6c23e3c9605dcf6151dae2e78adfcaa2472f8 100644 (file)
--- a/crypto/bn/asm/vis3-mont.pl
+++ b/crypto/bn/asm/vis3-mont.pl
@@ -34,7 +34,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/bn/bn_exp.c b/crypto/bn/bn_exp.c
index 46eea10f5d2d75b75a9a932991aeec372d0d92ec..c3bd5e7b5dcdbcaa24f0190d57fad04e7f843e81 100644 (file)
--- a/crypto/bn/bn_exp.c
+++ b/crypto/bn/bn_exp.c
@@ -29,7 +29,7 @@
 
 #undef SPARC_T4_MONT
 #if defined(OPENSSL_BN_ASM_MONT) && (defined(__sparc__) || defined(__sparc))
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 #define SPARC_T4_MONT
 #endif
 

diff --git a/crypto/bn/bn_ppc.c b/crypto/bn/bn_ppc.c
index 5a5f9b04b1a45bb25b7b4c75490af6828c55657c..f7e2568ab7571f4247916d7688bd2bea35b63348 100644 (file)
--- a/crypto/bn/bn_ppc.c
+++ b/crypto/bn/bn_ppc.c
@@ -9,7 +9,7 @@
 
 #include <openssl/crypto.h>
 #include <openssl/bn.h>
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #include "bn_local.h"
 
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,

diff --git a/crypto/bn/bn_s390x.c b/crypto/bn/bn_s390x.c
index 599f4eba5896f8226aa8b94e262f7e32d1979532..ef96161cedde415c6c1a5853eff9cb4318f9d5c3 100644 (file)
--- a/crypto/bn/bn_s390x.c
+++ b/crypto/bn/bn_s390x.c
@@ -8,7 +8,7 @@
  */
 
 #include "crypto/bn.h"
-#include "crypto/s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 #ifdef S390X_MOD_EXP
 

diff --git a/crypto/bn/bn_sparc.c b/crypto/bn/bn_sparc.c
index c58b25c3da973f290e7e772e91ecb295fc995151..1dedbdf26f91db2ce2801fa7423d02cbb9776a00 100644 (file)
--- a/crypto/bn/bn_sparc.c
+++ b/crypto/bn/bn_sparc.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <openssl/bn.h>
 #include "internal/cryptlib.h"
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 #include "bn_local.h" /* for definition of bn_mul_mont */
 
 int bn_mul_mont(BN_ULONG *rp, const BN_ULONG *ap, const BN_ULONG *bp,

diff --git a/crypto/camellia/asm/cmllt4-sparcv9.pl b/crypto/camellia/asm/cmllt4-sparcv9.pl
index 86e38d65c4768364293bc4f998895ccf447e175d..c1299397e3c2e58c40d8ff2378865eeb2d99b390 100644 (file)
--- a/crypto/camellia/asm/cmllt4-sparcv9.pl
+++ b/crypto/camellia/asm/cmllt4-sparcv9.pl
@@ -69,7 +69,7 @@ $code=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 .text
 

diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
index cb5441ad8b834ba049197a80697a0a68366ab15a..24acb742b073146fc2c5628047df51aecb364d39 100755 (executable)
--- a/crypto/chacha/asm/chacha-armv4.pl
+++ b/crypto/chacha/asm/chacha-armv4.pl
@@ -171,7 +171,7 @@ my @ret;
 }
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__) || defined(__clang__)
 .syntax        unified

diff --git a/crypto/chacha/asm/chacha-armv8-sve.pl b/crypto/chacha/asm/chacha-armv8-sve.pl
index 40454c33223aa2e979b0e8f64762d152eea60093..df5232d62139c5304020b4e253cc68537c29dc34 100755 (executable)
--- a/crypto/chacha/asm/chacha-armv8-sve.pl
+++ b/crypto/chacha/asm/chacha-armv8-sve.pl
@@ -724,7 +724,7 @@ ___
        my ($sve2flag) = ("x7");
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .arch   armv8-a
 

diff --git a/crypto/chacha/asm/chacha-armv8.pl b/crypto/chacha/asm/chacha-armv8.pl
index f500bf1eb54b00097ad52d61d7105efaa026aeb1..ccbc816136eec9c59bc226ee0d9a73cc3a97b82b 100755 (executable)
--- a/crypto/chacha/asm/chacha-armv8.pl
+++ b/crypto/chacha/asm/chacha-armv8.pl
@@ -132,7 +132,7 @@ my ($a3,$b3,$c3,$d3)=map(($_&~3)+(($_+1)&3),($a2,$b2,$c2,$d2));
 }
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 #ifndef        __KERNEL__
 .extern        OPENSSL_armcap_P
 .hidden        OPENSSL_armcap_P

diff --git a/crypto/chacha/asm/chacha-loongarch64.pl b/crypto/chacha/asm/chacha-loongarch64.pl
index 43adf75ce394f5ee2be8b3803f2c46e19264daec..e78f668927c708192955ec422d2739ae8e08c5e2 100644 (file)
--- a/crypto/chacha/asm/chacha-loongarch64.pl
+++ b/crypto/chacha/asm/chacha-loongarch64.pl
@@ -46,7 +46,7 @@ open STDOUT,">$output";
 my ($out, $inp, $len, $key, $counter) = ($a0, $a1, $a2, $a3, $a4);
 
 $code .= <<EOF;
-#include "loongarch_arch.h"
+#include "arch/loongarch_arch.h"
 
 .text
 

diff --git a/crypto/chacha/asm/chacha-s390x.pl b/crypto/chacha/asm/chacha-s390x.pl
index bf393a6c7bbd34af728ec9dda6721b4de26a452e..a5a7102b7a0d228f2c98b51380d53124428e4ee7 100755 (executable)
--- a/crypto/chacha/asm/chacha-s390x.pl
+++ b/crypto/chacha/asm/chacha-s390x.pl
@@ -240,7 +240,7 @@ my $odd=@_[24];
 
 PERLASM_BEGIN($output);
 
-INCLUDE        ("s390x_arch.h");
+INCLUDE        ("arch/s390x_arch.h");
 TEXT   ();
 
 ################

diff --git a/crypto/chacha/chacha_ppc.c b/crypto/chacha/chacha_ppc.c
index b36881a83366901565a4ca60614e71d46afee271..d2e0a68baa4c0ca60ecf9bbcc695db37ae29375c 100644 (file)
--- a/crypto/chacha/chacha_ppc.c
+++ b/crypto/chacha/chacha_ppc.c
@@ -12,7 +12,7 @@
 
 #include <openssl/opensslconf.h>
 #include "crypto/chacha.h"
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 
 void ChaCha20_ctr32_int(unsigned char *out, const unsigned char *inp,
     size_t len, const unsigned int key[8],

diff --git a/crypto/chacha/chacha_riscv.c b/crypto/chacha/chacha_riscv.c
index c9f17b35d85dc1446b14ebbc1e213fff4d3ef002..e3e24c99fab71bcc8bec7adad3ee666b841b4508 100644 (file)
--- a/crypto/chacha/chacha_riscv.c
+++ b/crypto/chacha/chacha_riscv.c
@@ -38,7 +38,7 @@
 
 #include <openssl/opensslconf.h>
 #include "crypto/chacha.h"
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 
 void ChaCha20_ctr32_v_zbb_zvkb(unsigned char *out, const unsigned char *inp,
     size_t len, const unsigned int key[8],

diff --git a/crypto/des/asm/dest4-sparcv9.pl b/crypto/des/asm/dest4-sparcv9.pl
index afa15860f0a0a0cadce9539a7a23c24f35f8cb39..87a5a82742ccc6fc413d10840cfd7a1e19150bf1 100644 (file)
--- a/crypto/des/asm/dest4-sparcv9.pl
+++ b/crypto/des/asm/dest4-sparcv9.pl
@@ -40,7 +40,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register       %g2,#scratch

diff --git a/crypto/ec/asm/ecp_nistz256-armv4.pl b/crypto/ec/asm/ecp_nistz256-armv4.pl
index 77fd64c90a2ffc8ae78b3ecfc50522b4c0c28456..f00767e28badb6ac3c17e99d847d01ac56ec6a6e 100755 (executable)
--- a/crypto/ec/asm/ecp_nistz256-armv4.pl
+++ b/crypto/ec/asm/ecp_nistz256-armv4.pl
@@ -51,7 +51,7 @@ if ($flavour && $flavour ne "void") {
 }
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__)
 .syntax        unified

diff --git a/crypto/ec/asm/ecp_nistz256-armv8.pl b/crypto/ec/asm/ecp_nistz256-armv8.pl
index f84c6d49e7e56f1c928dd93e801d6fbe48272b2f..9ecabca7a7d3005f1adbf38a1f0f98efb60d1e51 100644 (file)
--- a/crypto/ec/asm/ecp_nistz256-armv8.pl
+++ b/crypto/ec/asm/ecp_nistz256-armv8.pl
@@ -53,7 +53,7 @@ my ($rp,$ap,$bp,$bi,$a0,$a1,$a2,$a3,$t0,$t1,$t2,$t3,$poly1,$poly3,
 my ($acc6,$acc7)=($ap,$bp);    # used in __ecp_nistz256_sqr_mont
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .rodata
 ___

diff --git a/crypto/ec/asm/ecp_nistz256-sparcv9.pl b/crypto/ec/asm/ecp_nistz256-sparcv9.pl
index 33f8ea203223a099c0c8517a99af82e01611918e..0171420aaa0698d27566e2d982139e2d08123d5b 100755 (executable)
--- a/crypto/ec/asm/ecp_nistz256-sparcv9.pl
+++ b/crypto/ec/asm/ecp_nistz256-sparcv9.pl
@@ -37,7 +37,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #define LOCALS (STACK_BIAS+STACK_FRAME)
 #ifdef __arch64__

diff --git a/crypto/ec/asm/ecp_sm2p256-armv8.pl b/crypto/ec/asm/ecp_sm2p256-armv8.pl
index 6db0b6d7aa3f36cdc1d40a6edb9b2a6ab79fea88..34def77c6e0ae0bf3367522f5d1b00bc8469814f 100644 (file)
--- a/crypto/ec/asm/ecp_sm2p256-armv8.pl
+++ b/crypto/ec/asm/ecp_sm2p256-armv8.pl
@@ -162,7 +162,7 @@ ___
 
 {
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 .arch  armv8-a
 .rodata
 

diff --git a/crypto/ec/ecp_nistp384.c b/crypto/ec/ecp_nistp384.c
index ce42edad0598dda63768317ce8986ba2b4e11061..aedd052d9854e1cba5096c6b510c57571680278c 100644 (file)
--- a/crypto/ec/ecp_nistp384.c
+++ b/crypto/ec/ecp_nistp384.c
@@ -720,7 +720,7 @@ void p384_felem_square_reduce(felem out, const felem in);
 void p384_felem_mul_reduce(felem out, const felem in1, const felem in2);
 
 #if defined(_ARCH_PPC64)
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #endif
 
 static void felem_select(void)

diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 3c088d9a5f8501dfafa41eb87ff552bb894a2671..1fb747eba0c1789494d4172d372b9a47d31b0c62 100644 (file)
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -605,7 +605,7 @@ void p521_felem_square(largefelem out, const felem in);
 void p521_felem_mul(largefelem out, const felem in1, const felem in2);
 
 #if defined(_ARCH_PPC64)
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #endif
 
 static void felem_select(void)

diff --git a/crypto/ec/ecp_ppc.c b/crypto/ec/ecp_ppc.c
index e038a0747551e1d210bd451941e808fec58ba083..5fd27654fde681a4b46ecf279837a24a2ffb078d 100644 (file)
--- a/crypto/ec/ecp_ppc.c
+++ b/crypto/ec/ecp_ppc.c
@@ -8,7 +8,7 @@
  */
 
 #include "internal/cryptlib.h"
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #include "ec_local.h"
 
 void ecp_nistz256_mul_mont(unsigned long res[4], const unsigned long a[4],

diff --git a/crypto/ec/ecp_s390x_nistp.c b/crypto/ec/ecp_s390x_nistp.c
index a405625d67331063b97a7b4e4e8d2109b32254fc..c05f21c7329c70182b1eb51b427d55d44785cb91 100644 (file)
--- a/crypto/ec/ecp_s390x_nistp.c
+++ b/crypto/ec/ecp_s390x_nistp.c
@@ -18,7 +18,7 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #include "ec_local.h"
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 /* Size of parameter blocks */
 #define S390X_SIZE_PARAM 4096

diff --git a/crypto/ec/ecx_key.c b/crypto/ec/ecx_key.c
index 2fed62c3610081da27d6529295dfaa05297a5179..4d8c9457554cec44a5280e4eab24b5a52af052bd 100644 (file)
--- a/crypto/ec/ecx_key.c
+++ b/crypto/ec/ecx_key.c
@@ -14,7 +14,7 @@
 #include "internal/common.h" /* for ossl_assert() */
 
 #ifdef S390X_EC_ASM
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 #endif
 
 ECX_KEY *ossl_ecx_key_new(OSSL_LIB_CTX *libctx, ECX_KEY_TYPE type, int haspubkey,

diff --git a/crypto/ec/ecx_s390x.c b/crypto/ec/ecx_s390x.c
index 4b9514084aec2013a5d4686e9c57d8da2f08ca76..5f0cad0fe3ca00d567e8515de7bfb4fe0c77f1fc 100644 (file)
--- a/crypto/ec/ecx_s390x.c
+++ b/crypto/ec/ecx_s390x.c
@@ -15,7 +15,7 @@
 #include "ec_local.h"
 #include "curve448/curve448_local.h"
 #include "ecx_backend.h"
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 #include "internal/constant_time.h"
 
 static void s390x_x25519_mod_p(unsigned char u[32])

diff --git a/crypto/hmac/hmac_s390x.c b/crypto/hmac/hmac_s390x.c
index eede428cf0793563ae96cb8b1797d304b7833962..873e9752842e29f2f1751a0be2ddda8690fbf8c6 100644 (file)
--- a/crypto/hmac/hmac_s390x.c
+++ b/crypto/hmac/hmac_s390x.c
@@ -10,7 +10,7 @@
 /* We need to use some engine deprecated APIs */
 #define OPENSSL_SUPPRESS_DEPRECATED
 
-#include "crypto/s390x_arch.h"
+#include "arch/s390x_arch.h"
 #include "hmac_local.h"
 #include "openssl/obj_mac.h"
 #include "openssl/evp.h"

diff --git a/crypto/info.c b/crypto/info.c
index fe8e5fa2a9a41edd91a0feb0c341774470772831..2038db5a52961fc0c98cbfbcc26799cfe5ef0cf1 100644 (file)
--- a/crypto/info.c
+++ b/crypto/info.c
@@ -21,19 +21,19 @@
 #endif
 
 #if defined(__arm__) || defined(__arm) || defined(__aarch64__)
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 #define CPU_INFO_STR_LEN 128
 #elif defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC)
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #define CPU_INFO_STR_LEN 128
 #elif defined(__sparcv9) || defined(__sparcv9__)
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 #define CPU_INFO_STR_LEN 128
 #elif defined(__s390__) || defined(__s390x__)
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 #define CPU_INFO_STR_LEN 2048
 #elif defined(__riscv)
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 #define CPU_INFO_STR_LEN 2048
 #else
 #define CPU_INFO_STR_LEN 256

diff --git a/crypto/init.c b/crypto/init.c
index 0d10f7bf0244753db54d4af39f2ed17da6566fd1..302e37f7fae33d01ed9bf1375d0dbdab179de679 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -34,7 +34,7 @@
 #include "sslerr.h"
 
 #ifdef S390X_MOD_EXP
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 #endif
 
 static int stopped = 0;

diff --git a/crypto/loongarchcap.c b/crypto/loongarchcap.c
index 5375eb3655aad47ba6f6f3b704ac6353060a5c46..d259276e476257904a41c5b6ec8bc24622f40c09 100644 (file)
--- a/crypto/loongarchcap.c
+++ b/crypto/loongarchcap.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 #include <sys/auxv.h>
-#include "loongarch_arch.h"
+#include "arch/loongarch_arch.h"
 
 unsigned int OPENSSL_loongarch_hwcap_P = 0;
 

diff --git a/crypto/md5/asm/md5-aarch64.pl b/crypto/md5/asm/md5-aarch64.pl
index 02bc05caaf51898d46b734fcca9b7a6e5c4f0527..6ef69715d021958620d46b66a2c94a0bf89178c1 100755 (executable)
--- a/crypto/md5/asm/md5-aarch64.pl
+++ b/crypto/md5/asm/md5-aarch64.pl
@@ -28,7 +28,7 @@ open OUT,"| \"$^X\" $xlate $flavour \"$output\""
 *STDOUT=*OUT;
 
 $code .= <<EOF;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .text
 .globl  ossl_md5_block_asm_data_order

diff --git a/crypto/md5/asm/md5-sparcv9.pl b/crypto/md5/asm/md5-sparcv9.pl
index cecaadb1145f524fd7a58eb79cb565209b2e9378..24439e490bbd446ebfea43d6004217dc5b63c0fd 100644 (file)
--- a/crypto/md5/asm/md5-sparcv9.pl
+++ b/crypto/md5/asm/md5-sparcv9.pl
@@ -206,7 +206,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/md5/md5_riscv.c b/crypto/md5/md5_riscv.c
index 1f00d9e034c04ef60f6ce3769490058033666c60..64dd1a5a26ea53d66e86052d9041a8f179e9f03a 100644 (file)
--- a/crypto/md5/md5_riscv.c
+++ b/crypto/md5/md5_riscv.c
@@ -9,7 +9,7 @@
 
 #include <openssl/opensslconf.h>
 #include <openssl/md5.h>
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 
 void ossl_md5_block_asm_data_order(MD5_CTX *c, const void *p, size_t num);
 void ossl_md5_block_asm_data_order_zbb(MD5_CTX *c, const void *p, size_t num);

diff --git a/crypto/ml_kem/ml_kem.c b/crypto/ml_kem/ml_kem.c
index 97cc3cad7de8e689b82a7f4a48472777cdc95469..e40047e5962b2c40eecc584b5b2c41b8e6489f5f 100644 (file)
--- a/crypto/ml_kem/ml_kem.c
+++ b/crypto/ml_kem/ml_kem.c
@@ -408,7 +408,7 @@ static __owur int sample_scalar(scalar *out, EVP_MD_CTX *mdctx)
 static CRYPTO_ONCE ml_kem_ntt_once = CRYPTO_ONCE_STATIC_INIT;
 
 #if defined(_ARCH_PPC64)
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #endif
 
 #if defined(MLKEM_NTT_PPC_ASM) && defined(_ARCH_PPC64)

diff --git a/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl b/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
index d516359eb81b8cbfb2e41471e85a994dc8b5dd15..81d1c195a9353b533fb5f818c853b6fb8e646527 100644 (file)
--- a/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
+++ b/crypto/modes/asm/aes-gcm-armv8-unroll8_64.pl
@@ -170,7 +170,7 @@ open OUT,"| \"$^X\" $xlate $flavour $output";
 *STDOUT=*OUT;
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=8
 ___

diff --git a/crypto/modes/asm/aes-gcm-armv8_64.pl b/crypto/modes/asm/aes-gcm-armv8_64.pl
index 507e8c341e3df88fb47252afc8f07d87f058a591..d4c076961bd75ccd6aa98ab79a53e94b87ed99f3 100755 (executable)
--- a/crypto/modes/asm/aes-gcm-armv8_64.pl
+++ b/crypto/modes/asm/aes-gcm-armv8_64.pl
@@ -225,7 +225,7 @@ my $rk4v="v22";
 my $rk4d="d22";
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=8
 ___

diff --git a/crypto/modes/asm/ghash-armv4.pl b/crypto/modes/asm/ghash-armv4.pl
index 5a0a406ee3ef6c636da4658723a384b6f89d003c..79bfaaf9dac06660c74694754be5188395658ac0 100644 (file)
--- a/crypto/modes/asm/ghash-armv4.pl
+++ b/crypto/modes/asm/ghash-armv4.pl
@@ -142,7 +142,7 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__) || defined(__clang__)
 .syntax        unified

diff --git a/crypto/modes/asm/ghash-s390x.pl b/crypto/modes/asm/ghash-s390x.pl
index 48dc33d99a1cd18028d8ef4e424d6267be3d0724..fbb4ac6ffa08254b75256341c91633e0c5911175 100644 (file)
--- a/crypto/modes/asm/ghash-s390x.pl
+++ b/crypto/modes/asm/ghash-s390x.pl
@@ -82,7 +82,7 @@ $rem_4bit="%r14";
 $sp="%r15";
 
 $code.=<<___;
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 .text
 

diff --git a/crypto/modes/asm/ghash-sparcv9.pl b/crypto/modes/asm/ghash-sparcv9.pl
index 8096d2d0337a832b7fff45d407e6a9ae869aa3c1..63021645c06a63b15a2aa969adb1f473c24e1953 100644 (file)
--- a/crypto/modes/asm/ghash-sparcv9.pl
+++ b/crypto/modes/asm/ghash-sparcv9.pl
@@ -83,7 +83,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef  __arch64__
 .register      %g2,#scratch

diff --git a/crypto/modes/asm/ghashv8-armx.pl b/crypto/modes/asm/ghashv8-armx.pl
index 5401e50bf898a6ec7e4ea80535743ae8d3a5ed2a..065154a8b3d648a9b4eb55305b82fb984627d309 100644 (file)
--- a/crypto/modes/asm/ghashv8-armx.pl
+++ b/crypto/modes/asm/ghashv8-armx.pl
@@ -73,7 +73,7 @@ my ($t0,$t1,$t2,$xC2,$H,$Hhl,$H2)=map("q$_",(8..14));
 my $_byte = ($flavour =~ /win/ ? "DCB" : ".byte");
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=7
 ___

diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 16c13e2961e448a2b41f4a22e01bc3639c23d4b9..0bef7440f8a4bab345a526d5c22f905c4d574a8d 100644 (file)
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -368,7 +368,7 @@ void gcm_ghash_4bit_x86(u64 Xi[2], const u128 Htable[16], const u8 *inp,
     size_t len);
 #endif
 #elif defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64)
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 #if __ARM_MAX_ARCH__ >= 7
 #define GHASH_ASM_ARM
 #define PMULL_CAPABLE (OPENSSL_armcap_P & ARMV8_PMULL)
@@ -385,21 +385,21 @@ void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
     size_t len);
 #endif
 #elif defined(__sparc__) || defined(__sparc)
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 #define GHASH_ASM_SPARC
 void gcm_init_vis3(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_vis3(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_vis3(u64 Xi[2], const u128 Htable[16], const u8 *inp,
     size_t len);
 #elif defined(OPENSSL_CPUID_OBJ) && (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #define GHASH_ASM_PPC
 void gcm_init_p8(u128 Htable[16], const u64 Xi[2]);
 void gcm_gmult_p8(u64 Xi[2], const u128 Htable[16]);
 void gcm_ghash_p8(u64 Xi[2], const u128 Htable[16], const u8 *inp,
     size_t len);
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 #define GHASH_ASM_RV64I
 /* Zbc/Zbkc (scalar crypto with clmul) based routines. */
 void gcm_init_rv64i_zbc(u128 Htable[16], const u64 Xi[2]);

diff --git a/crypto/poly1305/asm/poly1305-armv4.pl b/crypto/poly1305/asm/poly1305-armv4.pl
index 05751238fe0331a9c22f3f25dc0fb6eecf28658b..31500feed284b6e67ecc1fb4dc52a892609b6456 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-armv4.pl
+++ b/crypto/poly1305/asm/poly1305-armv4.pl
@@ -48,7 +48,7 @@ if ($flavour && $flavour ne "void") {
 ($ctx,$inp,$len,$padbit)=map("r$_",(0..3));
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__)
 .syntax        unified

diff --git a/crypto/poly1305/asm/poly1305-armv8.pl b/crypto/poly1305/asm/poly1305-armv8.pl
index 6659cd631f37016effb7d87014284e26494869ef..17bf15d781a125ca32a7edf1e52ce72555777e39 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-armv8.pl
+++ b/crypto/poly1305/asm/poly1305-armv8.pl
@@ -55,7 +55,7 @@ my ($mac,$nonce)=($inp,$len);
 my ($h0,$h1,$h2,$r0,$r1,$s1,$t0,$t1,$d0,$d1,$d2) = map("x$_",(4..14));
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .text
 

diff --git a/crypto/poly1305/asm/poly1305-armv9-sve2.pl b/crypto/poly1305/asm/poly1305-armv9-sve2.pl
index b68741fe58be1f1eb3c3905ce8641c40e24e72a9..7f957f0188f6096fcf85168da1f90f1930102096 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-armv9-sve2.pl
+++ b/crypto/poly1305/asm/poly1305-armv9-sve2.pl
@@ -104,7 +104,7 @@ my ($pwr,$mask) = map("x$_",(25..26));
 my $is_base2_26 = "w17";
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .text
 

diff --git a/crypto/poly1305/asm/poly1305-mips.pl b/crypto/poly1305/asm/poly1305-mips.pl
index a41def668cb863cb2f769298d96b222ef1d1e32b..7ecf2855206af669fa69aae356f494711c4e0b5a 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-mips.pl
+++ b/crypto/poly1305/asm/poly1305-mips.pl
@@ -71,7 +71,7 @@ $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0x0003f000" : "0x00030000";
 ($in0,$in1,$tmp0,$tmp1,$tmp2,$tmp3,$tmp4) = ($a4,$a5,$a6,$a7,$at,$t0,$t1);
 
 $code.=<<___;
-#include "mips_arch.h"
+#include "arch/mips_arch.h"
 
 #ifdef MIPSEB
 # define MSB 0

diff --git a/crypto/poly1305/asm/poly1305-s390x.pl b/crypto/poly1305/asm/poly1305-s390x.pl
index 8f3f97a1cf4e2658f24fe8fba6309fefee8f5906..34e4f5cf2db57ea8d6a86c6cd44545336aad3044 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-s390x.pl
+++ b/crypto/poly1305/asm/poly1305-s390x.pl
@@ -68,7 +68,7 @@ my ($ctx,$inp,$len,$padbit) = map("%r$_",(2..5));
 
 PERLASM_BEGIN($output);
 
-INCLUDE        ("s390x_arch.h");
+INCLUDE        ("arch/s390x_arch.h");
 TEXT   ();
 
 ################

diff --git a/crypto/poly1305/asm/poly1305-sparcv9.pl b/crypto/poly1305/asm/poly1305-sparcv9.pl
index a3282a8058d866df3a58a5fb8706c1cca89bc75a..62ab114acb1e35b3246da0429867f28137974ade 100755 (executable)
--- a/crypto/poly1305/asm/poly1305-sparcv9.pl
+++ b/crypto/poly1305/asm/poly1305-sparcv9.pl
@@ -55,7 +55,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/poly1305/poly1305_ppc.c b/crypto/poly1305/poly1305_ppc.c
index a40ce729b729ba82a9169d4b8e6deb863d88041b..4a2a943a8bef3b26309cdcfc7ad0b3b4addd2417 100644 (file)
--- a/crypto/poly1305/poly1305_ppc.c
+++ b/crypto/poly1305/poly1305_ppc.c
@@ -10,7 +10,7 @@
 #include <openssl/opensslconf.h>
 #include <openssl/types.h>
 #include "crypto/poly1305.h"
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 
 void poly1305_init_int(void *ctx, const unsigned char key[16]);
 void poly1305_blocks(void *ctx, const unsigned char *inp, size_t len,

diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index 69b3254b6dd01d46d300cf75574dcb26b42466df..a2acf6b6ed2965152a99d2417b3f2b5b85001c3b 100644 (file)
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -28,7 +28,7 @@
 #endif
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 
 unsigned int OPENSSL_ppccap_P = 0;
 

diff --git a/crypto/riscvcap.c b/crypto/riscvcap.c
index b4cfbdc42983e30964eedb200b4f21bf482939b7..cdec9a021630777f362a66bfa987e3dd185ffdcf 100644 (file)
--- a/crypto/riscvcap.c
+++ b/crypto/riscvcap.c
@@ -15,7 +15,7 @@
 #include "internal/cryptlib.h"
 
 #define OPENSSL_RISCVCAP_IMPL
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 
 #ifdef OSSL_RISCV_HWPROBE
 #include <unistd.h>

diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
index 77b3b0307a6cf8efd2d545b5763a6248d177f05f..5453f33c127ac27e91ca2abfbfb615e38fb5396c 100644 (file)
--- a/crypto/s390xcap.c
+++ b/crypto/s390xcap.c
@@ -14,7 +14,7 @@
 #include <signal.h>
 #include "internal/cryptlib.h"
 #include "crypto/ctype.h"
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 #if defined(OPENSSL_SYS_LINUX) && !defined(FIPS_MODULE)
 #include <sys/types.h>

diff --git a/crypto/s390xcpuid.pl b/crypto/s390xcpuid.pl
index 2860a170485d458c9f30cebb1b70930b0970e435..dce17a3bfac8801b6e37414ea8c8a4b554aa8df3 100755 (executable)
--- a/crypto/s390xcpuid.pl
+++ b/crypto/s390xcpuid.pl
@@ -26,7 +26,7 @@ $sp="%r15";
 $stdframe=16*$SIZE_T+4*8;
 
 $code=<<___;
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 .text
 

diff --git a/crypto/sha/asm/keccak1600-armv4.pl b/crypto/sha/asm/keccak1600-armv4.pl
index 4e81bb805beabddd8a26c6c48cc597cc480c2247..896ce6ec5bd7d87fbc6a949ecc6e90065dd20adf 100755 (executable)
--- a/crypto/sha/asm/keccak1600-armv4.pl
+++ b/crypto/sha/asm/keccak1600-armv4.pl
@@ -113,7 +113,7 @@ my @D = map(8*$_, (25..29));
 my @T = map([ 8*$_, 8*($_+1), 8*($_+2), 8*($_+3), 8*($_+4) ], (30,35,40,45,50));
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__)
 .syntax        unified

diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl
index 61096079d3160a4d4a918494ff4b76e3c4a553aa..48247dcd27bf415c6cb9644721fdd45d8474a44c 100755 (executable)
--- a/crypto/sha/asm/keccak1600-armv8.pl
+++ b/crypto/sha/asm/keccak1600-armv8.pl
@@ -80,7 +80,7 @@ my @rhotates = ([  0,  1, 62, 28, 27 ],
                 [ 18,  2, 61, 56, 14 ]);
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 .rodata
 

diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
index 7ef7bd6e91ec57c319733b5d4d27ae05af148167..38f5ae988d744e29cda381d0b369e7c0bc95d838 100644 (file)
--- a/crypto/sha/asm/sha1-armv4-large.pl
+++ b/crypto/sha/asm/sha1-armv4-large.pl
@@ -187,7 +187,7 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 #if defined(__thumb2__)
 .syntax        unified

diff --git a/crypto/sha/asm/sha1-armv8.pl b/crypto/sha/asm/sha1-armv8.pl
index 1c1920f70219ff1a80708827088f6b04e6401e56..4eeec6b0b272af152c7014e92fb6ead1168939f1 100644 (file)
--- a/crypto/sha/asm/sha1-armv8.pl
+++ b/crypto/sha/asm/sha1-armv8.pl
@@ -175,7 +175,7 @@ ___
 }
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 #ifndef        __KERNEL__
 .extern OPENSSL_armcap_P
 .hidden OPENSSL_armcap_P

diff --git a/crypto/sha/asm/sha1-mips.pl b/crypto/sha/asm/sha1-mips.pl
index 870a05a1092032d6442893fe10e127b7d82e8ac4..c60791b17540b5c37053f244bf598be3a7c0c747 100644 (file)
--- a/crypto/sha/asm/sha1-mips.pl
+++ b/crypto/sha/asm/sha1-mips.pl
@@ -343,7 +343,7 @@ $FRAMESIZE=16;      # large enough to accommodate NUBI saved registers
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc0fff008" : "0xc0ff0000";
 
 $code=<<___;
-#include "mips_arch.h"
+#include "arch/mips_arch.h"
 
 .text
 

diff --git a/crypto/sha/asm/sha1-s390x.pl b/crypto/sha/asm/sha1-s390x.pl
index 6762932a87b476c5fd40a5de42678a5f76790bff..448b4a88485227a0c34fc50f43ead0f64cf933c2 100644 (file)
--- a/crypto/sha/asm/sha1-s390x.pl
+++ b/crypto/sha/asm/sha1-s390x.pl
@@ -162,7 +162,7 @@ ___
 }
 
 $code.=<<___;
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 .text
 .align 64

diff --git a/crypto/sha/asm/sha1-sparcv9.pl b/crypto/sha/asm/sha1-sparcv9.pl
index a95d5717ee8306ffaaeffada5d196cf5bc5d6b19..24ee48222af786bd49b32d09b94f83b2211b0df3 100644 (file)
--- a/crypto/sha/asm/sha1-sparcv9.pl
+++ b/crypto/sha/asm/sha1-sparcv9.pl
@@ -190,7 +190,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index ba05676f144eaeb96a101ba3eeb66dbe7e85991b..1bcf7cea4fda34dba37a263544e95a2518982f6c 100644 (file)
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -177,7 +177,7 @@ ___
 
 $code=<<___;
 #ifndef __KERNEL__
-# include "arm_arch.h"
+# include "arch/arm_arch.h"
 #else
 # define __ARM_ARCH__ __LINUX_ARM_ARCH__
 # define __ARM_MAX_ARCH__ 7

diff --git a/crypto/sha/asm/sha512-armv4.pl b/crypto/sha/asm/sha512-armv4.pl
index 597854b6a6ce0225172aa5fe6af9921b36c47160..a7d7b19b1909d8f49d98fa5c1568006dac3ed03d 100644 (file)
--- a/crypto/sha/asm/sha512-armv4.pl
+++ b/crypto/sha/asm/sha512-armv4.pl
@@ -203,7 +203,7 @@ my $_word = ($flavour =~ /win/ ? "DCDU" : ".word");
 
 $code=<<___;
 #ifndef __KERNEL__
-# include "arm_arch.h"
+# include "arch/arm_arch.h"
 # define VFP_ABI_PUSH  vstmdb  sp!,{d8-d15}
 # define VFP_ABI_POP   vldmia  sp!,{d8-d15}
 #else

diff --git a/crypto/sha/asm/sha512-armv8.pl b/crypto/sha/asm/sha512-armv8.pl
index 6fb26e912b5a9d0ffba2a9206a43a983b29e6f14..66c29a5eef9e9d50221c1894f4d8d38fb57d69c6 100644 (file)
--- a/crypto/sha/asm/sha512-armv8.pl
+++ b/crypto/sha/asm/sha512-armv8.pl
@@ -190,7 +190,7 @@ ___
 }
 
 $code.=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 #ifndef        __KERNEL__
 .extern        OPENSSL_armcap_P
 .hidden        OPENSSL_armcap_P

diff --git a/crypto/sha/asm/sha512-mips.pl b/crypto/sha/asm/sha512-mips.pl
index 58aac18eb972d5646a2ab551212b7e8dac5e5c13..cbca8163a0ba456ef4a288b3bc83cc53992d4298 100644 (file)
--- a/crypto/sha/asm/sha512-mips.pl
+++ b/crypto/sha/asm/sha512-mips.pl
@@ -308,7 +308,7 @@ $FRAMESIZE=16*$SZ+16*$SZREG;
 $SAVED_REGS_MASK = ($flavour =~ /nubi/i) ? "0xc0fff008" : "0xc0ff0000";
 
 $code.=<<___;
-#include "mips_arch.h"
+#include "arch/mips_arch.h"
 
 .text
 .set   noat

diff --git a/crypto/sha/asm/sha512-s390x.pl b/crypto/sha/asm/sha512-s390x.pl
index f4cf4848cf9951f8bc97734723c6d5c335ebcb51..7d57eaaa47e713cc49e4287becb84f1d25b907be 100644 (file)
--- a/crypto/sha/asm/sha512-s390x.pl
+++ b/crypto/sha/asm/sha512-s390x.pl
@@ -172,7 +172,7 @@ ___
 }
 
 $code.=<<___;
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 .text
 .align 64

diff --git a/crypto/sha/asm/sha512-sparcv9.pl b/crypto/sha/asm/sha512-sparcv9.pl
index 4763e714ebe07f2df211ea5810aa83267241e3dd..b2c64c7a3f75cc33811b3f6e76c8bf052a1cc96c 100644 (file)
--- a/crypto/sha/asm/sha512-sparcv9.pl
+++ b/crypto/sha/asm/sha512-sparcv9.pl
@@ -397,7 +397,7 @@ $code.=<<___;
 #ifndef __ASSEMBLER__
 # define __ASSEMBLER__ 1
 #endif
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifdef __arch64__
 .register      %g2,#scratch

diff --git a/crypto/sha/sha3.c b/crypto/sha/sha3.c
index 4e82a277e95035667f0c3db581748191ca9d726b..5c8754cfd6e079f7e3649c7376fbc90ba103a2b1 100644 (file)
--- a/crypto/sha/sha3.c
+++ b/crypto/sha/sha3.c
@@ -12,11 +12,11 @@
 #include "internal/common.h"
 
 #if defined(__aarch64__) && defined(KECCAK1600_ASM)
-#include "crypto/arm_arch.h"
+#include "arch/arm_arch.h"
 #endif
 
 #if defined(__s390x__) && defined(OPENSSL_CPUID_OBJ)
-#include "crypto/s390x_arch.h"
+#include "arch/s390x_arch.h"
 #if defined(KECCAK1600_ASM)
 #define S390_SHA3 1
 #define S390_SHA3_CAPABLE(name) \

diff --git a/crypto/sha/sha_loongarch.c b/crypto/sha/sha_loongarch.c
index da8dac8975f877a649d057777593bd4ec4d9e853..55ececfe0410833a11241770fdeefde512aef3d9 100644 (file)
--- a/crypto/sha/sha_loongarch.c
+++ b/crypto/sha/sha_loongarch.c
@@ -12,7 +12,7 @@
 
 #include <openssl/opensslconf.h>
 #include <openssl/sha.h>
-#include "crypto/loongarch_arch.h"
+#include "arch/loongarch_arch.h"
 
 void sha256_block_data_order_la64v100(void *ctx, const void *in, size_t num);
 void sha256_block_data_order_lsx(void *ctx, const void *in, size_t num);

diff --git a/crypto/sha/sha_ppc.c b/crypto/sha/sha_ppc.c
index 9853a2321ad83fe1942c762896365e86f845aa77..0e5c5c57092cdbe434b08da8bd980f90990cc417 100644 (file)
--- a/crypto/sha/sha_ppc.c
+++ b/crypto/sha/sha_ppc.c
@@ -12,7 +12,7 @@
 
 #include <openssl/opensslconf.h>
 #include <openssl/sha.h>
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 
 void sha256_block_p8(void *ctx, const void *inp, size_t len);
 void sha256_block_ppc(void *ctx, const void *inp, size_t len);

diff --git a/crypto/sha/sha_riscv.c b/crypto/sha/sha_riscv.c
index 5a0eaaf11bc0768656fa8e77c45ed8ffb8aeb441..28248fd5ac07ebe2a140e378f23c3bb1061c60f4 100644 (file)
--- a/crypto/sha/sha_riscv.c
+++ b/crypto/sha/sha_riscv.c
@@ -12,7 +12,7 @@
 
 #include <openssl/opensslconf.h>
 #include <openssl/sha.h>
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 
 void sha256_block_data_order_zvkb_zvknha_or_zvknhb(void *ctx, const void *in,
     size_t num);

diff --git a/crypto/sm3/asm/sm3-armv8.pl b/crypto/sm3/asm/sm3-armv8.pl
index f36e0e2be98cfa975c9add41e4e3b74156129fc4..e0c33ecb958e7b46bd3567d535330faa5198267e 100644 (file)
--- a/crypto/sm3/asm/sm3-armv8.pl
+++ b/crypto/sm3/asm/sm3-armv8.pl
@@ -109,7 +109,7 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 .text
 ___
 

diff --git a/crypto/sm3/sm3_local.h b/crypto/sm3/sm3_local.h
index a8f92be87e571a1eda938a66a43624da47048421..6cb8dca61b1957fc35f225fb54b8191d3a652141 100644 (file)
--- a/crypto/sm3/sm3_local.h
+++ b/crypto/sm3/sm3_local.h
@@ -47,12 +47,12 @@
 
 #if defined(OPENSSL_SM3_ASM)
 #if defined(__aarch64__) || defined(_M_ARM64)
-#include "crypto/arm_arch.h"
+#include "arch/arm_arch.h"
 #define HWSM3_CAPABLE (OPENSSL_armcap_P & ARMV8_SM3)
 void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
 #endif
 #if defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 #define HWSM3_CAPABLE 1
 void ossl_hwsm3_block_data_order(SM3_CTX *c, const void *p, size_t num);
 #endif

diff --git a/crypto/sm3/sm3_riscv.c b/crypto/sm3/sm3_riscv.c
index f8abc4e2779f0158cf85cf2dcb9d82e868244e8b..3dcb3d2938ebc156c89ec2ed5dde99dd0150b676 100644 (file)
--- a/crypto/sm3/sm3_riscv.c
+++ b/crypto/sm3/sm3_riscv.c
@@ -12,7 +12,7 @@
 
 #include <openssl/opensslconf.h>
 #include "internal/sm3.h"
-#include "crypto/riscv_arch.h"
+#include "arch/riscv_arch.h"
 #include <stdio.h>
 
 void ossl_hwsm3_block_data_order_zvksh(SM3_CTX *c, const void *p, size_t num);

diff --git a/crypto/sm4/asm/sm4-armv8.pl b/crypto/sm4/asm/sm4-armv8.pl
index 1fe12dead49b9f914a9c5b03a8a1e760f5524ae2..8024922ece24b1227f611821de24acc446583d8d 100755 (executable)
--- a/crypto/sm4/asm/sm4-armv8.pl
+++ b/crypto/sm4/asm/sm4-armv8.pl
@@ -111,7 +111,7 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 .arch  armv8-a+crypto
 .text
 ___

diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
index c60ace15366fd5f576221bc4d0b655de6aa390a3..e242af75ee780e799bb6f6826a7a269e0641fc40 100755 (executable)
--- a/crypto/sm4/asm/vpsm4-armv8.pl
+++ b/crypto/sm4/asm/vpsm4-armv8.pl
@@ -537,7 +537,7 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 .arch  armv8-a
 .text
 

diff --git a/crypto/sm4/asm/vpsm4_ex-armv8.pl b/crypto/sm4/asm/vpsm4_ex-armv8.pl
index eac5a0f6a1d81a6d19cd46d697a601c545f4337f..fdb0d2994794c12296ccbb8a750dc9c955cfcec9 100644 (file)
--- a/crypto/sm4/asm/vpsm4_ex-armv8.pl
+++ b/crypto/sm4/asm/vpsm4_ex-armv8.pl
@@ -539,7 +539,7 @@ ___
 }
 
 $code=<<___;
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 .arch  armv8-a+crypto
 .text
 

diff --git a/crypto/sparcv9cap.c b/crypto/sparcv9cap.c
index b7f109581f5442fa35e2f775cdf89a8c1ce9a07b..c9cc2b9575ed6feed1bb5a5ef8383d981e49c942 100644 (file)
--- a/crypto/sparcv9cap.c
+++ b/crypto/sparcv9cap.c
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <openssl/bn.h>
 #include "internal/cryptlib.h"
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #if defined(__GNUC__) && defined(__linux)
 __attribute__((visibility("hidden")))

diff --git a/crypto/arm_arch.h b/include/arch/arm_arch.h
similarity index 100%
rename from crypto/arm_arch.h
rename to include/arch/arm_arch.h

diff --git a/crypto/loongarch_arch.h b/include/arch/loongarch_arch.h
similarity index 100%
rename from crypto/loongarch_arch.h
rename to include/arch/loongarch_arch.h

diff --git a/crypto/mips_arch.h b/include/arch/mips_arch.h
similarity index 100%
rename from crypto/mips_arch.h
rename to include/arch/mips_arch.h

diff --git a/include/crypto/ppc_arch.h b/include/arch/ppc_arch.h
similarity index 100%
rename from include/crypto/ppc_arch.h
rename to include/arch/ppc_arch.h

diff --git a/include/crypto/riscv_arch.def b/include/arch/riscv_arch.def
similarity index 100%
rename from include/crypto/riscv_arch.def
rename to include/arch/riscv_arch.def

diff --git a/include/crypto/riscv_arch.h b/include/arch/riscv_arch.h
similarity index 100%
rename from include/crypto/riscv_arch.h
rename to include/arch/riscv_arch.h

diff --git a/crypto/s390x_arch.h b/include/arch/s390x_arch.h
similarity index 100%
rename from crypto/s390x_arch.h
rename to include/arch/s390x_arch.h

diff --git a/include/crypto/sparc_arch.h b/include/arch/sparc_arch.h
similarity index 100%
rename from include/crypto/sparc_arch.h
rename to include/arch/sparc_arch.h

diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h
index bec9040e3e7515d625984984210f4573d8795a62..de65183417286089137be309d1224d125c208d0c 100644 (file)
--- a/include/crypto/aes_platform.h
+++ b/include/crypto/aes_platform.h
@@ -61,7 +61,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len,
 
 #if defined(OPENSSL_CPUID_OBJ)
 #if (defined(__powerpc__) || defined(__POWERPC__) || defined(_ARCH_PPC))
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #ifdef VPAES_ASM
 #define VPAES_CAPABLE (OPENSSL_ppccap_P & PPC_ALTIVEC)
 #endif
@@ -94,7 +94,7 @@ void gcm_ghash_p8(u64 Xi[2], const u128 Htable[16], const u8 *inp, size_t len);
 #endif /* PPC */
 
 #if (defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(_M_ARM64))
-#include "crypto/arm_arch.h"
+#include "arch/arm_arch.h"
 #if __ARM_MAX_ARCH__ >= 7
 #if defined(BSAES_ASM)
 #define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
@@ -172,7 +172,7 @@ void gcm_ghash_v8(u64 Xi[2], const u128 Htable[16], const u8 *inp, size_t len);
 #endif
 
 #if defined(__loongarch__) || defined(__loongarch64)
-#include "loongarch_arch.h"
+#include "arch/loongarch_arch.h"
 #if defined(VPAES_ASM)
 #define VPAES_CAPABLE (OPENSSL_loongarch_hwcap_P & LOONGARCH_HWCAP_LSX)
 #endif
@@ -299,7 +299,7 @@ void gcm_ghash_avx(u64 Xi[2], const u128 Htable[16], const u8 *in, size_t len);
 #elif defined(AES_ASM) && (defined(__sparc) || defined(__sparc__))
 
 /* Fujitsu SPARC64 X support */
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #define SPARC_AES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_AES)
 #define HWAES_CAPABLE (OPENSSL_sparcv9cap_P[0] & SPARCV9_FJAESX)
@@ -369,7 +369,7 @@ void aes256_t4_xts_decrypt(const unsigned char *in, unsigned char *out,
 
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__s390__)
 /* IBM S390X support */
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 /* Convert key size to function code: [16,24,32] -> [18,19,20]. */
 #define S390X_AES_FC(keylen) (S390X_AES_128 + ((((keylen) << 3) - 128) >> 6))
@@ -433,7 +433,7 @@ void aes256_t4_xts_decrypt(const unsigned char *in, unsigned char *out,
 #define S390X_AES_FC(keylen) (S390X_AES_128 + ((((keylen) << 3) - 128) >> 6))
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
 /* RISC-V 64 support */
-#include "riscv_arch.h"
+#include "arch/riscv_arch.h"
 
 /* Zkne and Zknd extensions (scalar crypto AES). */
 int rv64i_zkne_set_encrypt_key(const unsigned char *userKey, const int bits,
@@ -509,7 +509,7 @@ void gcm_ghash_rv64i_zvkg(u64 Xi[2], const u128 Htable[16], const u8 *inp,
 
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 32
 /* RISC-V 32 support */
-#include "riscv_arch.h"
+#include "arch/riscv_arch.h"
 
 int rv32i_zkne_set_encrypt_key(const unsigned char *userKey, const int bits,
     AES_KEY *key);

diff --git a/include/crypto/cmll_platform.h b/include/crypto/cmll_platform.h
index 02ed385c059a3194f2329d873f7321d8c46327e4..207084b123e59fcb836c3799c6c00081475fa20c 100644 (file)
--- a/include/crypto/cmll_platform.h
+++ b/include/crypto/cmll_platform.h
@@ -14,7 +14,7 @@
 #if defined(CMLL_ASM) && (defined(__sparc) || defined(__sparc__))
 
 /* Fujitsu SPARC64 X support */
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifndef OPENSSL_NO_CAMELLIA
 #define SPARC_CMLL_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_CAMELLIA)

diff --git a/include/crypto/des_platform.h b/include/crypto/des_platform.h
index e0210c664f76a778d81858a9df9385b87d66985e..660d1b6a1877f70a55c46ffd81c97d82dd63830d 100644 (file)
--- a/include/crypto/des_platform.h
+++ b/include/crypto/des_platform.h
@@ -14,7 +14,7 @@
 #if defined(DES_ASM) && (defined(__sparc) || defined(__sparc__))
 
 /* Fujitsu SPARC64 X support */
-#include "crypto/sparc_arch.h"
+#include "arch/sparc_arch.h"
 
 #ifndef OPENSSL_NO_DES
 #define SPARC_DES_CAPABLE (OPENSSL_sparcv9cap_P[1] & CFR_DES)

diff --git a/include/crypto/sm4_platform.h b/include/crypto/sm4_platform.h
index 56e8604fd7605784e9ee2f2555d168ac3377a3e7..48c9ff93cf691d8aca33b9f2164bfce55f0456cc 100644 (file)
--- a/include/crypto/sm4_platform.h
+++ b/include/crypto/sm4_platform.h
@@ -13,7 +13,7 @@
 
 #if defined(OPENSSL_CPUID_OBJ)
 #if defined(__aarch64__) || defined(_M_ARM64)
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 extern unsigned int OPENSSL_arm_midr;
 static inline int vpsm4_capable(void)
 {
@@ -37,7 +37,7 @@ static inline int vpsm4_ex_capable(void)
 #define HWSM4_ctr32_encrypt_blocks sm4_v8_ctr32_encrypt_blocks
 #elif defined(OPENSSL_CPUID_OBJ) && defined(__riscv) && __riscv_xlen == 64
 /* RV64 support */
-#include "riscv_arch.h"
+#include "arch/riscv_arch.h"
 /* Zvksed extension (vector crypto SM4). */
 int rv64i_zvksed_sm4_set_encrypt_key(const unsigned char *userKey,
     SM4_KEY *key);

diff --git a/providers/implementations/ciphers/cipher_aes_cfb_hw_s390x.inc b/providers/implementations/ciphers/cipher_aes_cfb_hw_s390x.inc
index 98d60809c427ebe6f8939f6ace340e48d39e7cf2..113c1de6a9c6726c31eb8c72788ce4085634f099 100644 (file)
--- a/providers/implementations/ciphers/cipher_aes_cfb_hw_s390x.inc
+++ b/providers/implementations/ciphers/cipher_aes_cfb_hw_s390x.inc
@@ -12,7 +12,7 @@
  * This file is included by cipher_aes_cfb_hw.c
  */
 
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 #include <stdio.h>
 

diff --git a/providers/implementations/ciphers/cipher_aes_hw_s390x.inc b/providers/implementations/ciphers/cipher_aes_hw_s390x.inc
index ed69f1709fccfb2cafbade97b6dcb2862b485644..be82d3be9b2713346b1c577ebeaa499c0c7aace3 100644 (file)
--- a/providers/implementations/ciphers/cipher_aes_hw_s390x.inc
+++ b/providers/implementations/ciphers/cipher_aes_hw_s390x.inc
@@ -12,7 +12,7 @@
  * This file is included by cipher_aes_hw.c
  */
 
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 #include <stdio.h>
 

diff --git a/providers/implementations/ciphers/cipher_aes_xts_s390x.inc b/providers/implementations/ciphers/cipher_aes_xts_s390x.inc
index 77341b3bbd4d1997889242e0c57a08750d23e772..b13d23581c32ddf0a8f75cc8d464f2a2d2c5cf21 100644 (file)
--- a/providers/implementations/ciphers/cipher_aes_xts_s390x.inc
+++ b/providers/implementations/ciphers/cipher_aes_xts_s390x.inc
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "crypto/s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 static OSSL_FUNC_cipher_encrypt_init_fn s390x_aes_xts_einit;
 static OSSL_FUNC_cipher_decrypt_init_fn s390x_aes_xts_dinit;

diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c
index f851e8987bb156c0b03eae83a2153b3ede5f3ba2..cae88b1d63369c618559f794bc47275b1ca6ad56 100644 (file)
--- a/providers/implementations/digests/sha3_prov.c
+++ b/providers/implementations/digests/sha3_prov.c
@@ -59,7 +59,7 @@
 /*
  * IBM S390X support
  */
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 #define S390_SHA3 1
 #define S390_SHA3_CAPABLE(name) \
     ((OPENSSL_s390xcap_P.kimd[0] & S390X_CAPBIT(S390X_##name)) && (OPENSSL_s390xcap_P.klmd[0] & S390X_CAPBIT(S390X_##name)))
@@ -362,7 +362,7 @@ static PROV_SHA3_METHOD cshake_keccak_s390x_md = {
         ctx->meth = shake_generic_md;        \
     }
 #elif defined(__aarch64__) && defined(KECCAK1600_ASM)
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 static sha3_absorb_fn armsha3_sha3_absorb;
 

diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c
index 8345f5a7bb0f280feb8d813df2137bb41e0e6842..8489ce2248b55d5c1676d367c4b154cbefb2cd38 100644 (file)
--- a/providers/implementations/keymgmt/ecx_kmgmt.c
+++ b/providers/implementations/keymgmt/ecx_kmgmt.c
@@ -27,7 +27,7 @@
 #include "prov/ecx.h"
 #include "prov/securitycheck.h"
 #ifdef S390X_EC_ASM
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 #include <openssl/sha.h> /* For SHA512_DIGEST_LENGTH */
 #endif
 
@@ -1025,7 +1025,7 @@ MAKE_KEYMGMT_FUNCTIONS(ed25519)
 MAKE_KEYMGMT_FUNCTIONS(ed448)
 
 #ifdef S390X_EC_ASM
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 static void *s390x_ecx_keygen25519(struct ecx_gen_ctx *gctx)
 {

diff --git a/providers/implementations/rands/seeding/rand_cpu_arm64.c b/providers/implementations/rands/seeding/rand_cpu_arm64.c
index 76bbedf119091e970e79a87caa2debe077efaa14..083b4826ae4f93fd0342ebac92d4b97d7a59f1c0 100644 (file)
--- a/providers/implementations/rands/seeding/rand_cpu_arm64.c
+++ b/providers/implementations/rands/seeding/rand_cpu_arm64.c
@@ -13,7 +13,7 @@
 #include "prov/seeding.h"
 
 #ifdef OPENSSL_RAND_SEED_RDCPU
-#include "crypto/arm_arch.h"
+#include "arch/arm_arch.h"
 
 size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len);
 

diff --git a/providers/implementations/signature/eddsa_sig.c b/providers/implementations/signature/eddsa_sig.c
index 40a2c66c339bad92b30826052b338ffb36ee5388..9c258667945f17d2cae3931ec438a80355f70a9e 100644 (file)
--- a/providers/implementations/signature/eddsa_sig.c
+++ b/providers/implementations/signature/eddsa_sig.c
@@ -30,7 +30,7 @@
 #include "providers/implementations/signature/eddsa_sig.inc"
 
 #ifdef S390X_EC_ASM
-#include "s390x_arch.h"
+#include "arch/s390x_arch.h"
 
 #define S390X_CAN_SIGN(edtype)                                                    \
     ((OPENSSL_s390xcap_P.pcc[1] & S390X_CAPBIT(S390X_SCALAR_MULTIPLY_##edtype))   \

diff --git a/test/chacha_internal_test.c b/test/chacha_internal_test.c
index 358bf7fc68f10722c1c799f6511ad44e4af4f7a7..effdc26b883e1759551a9b77d2ce1dc7be62b890 100644 (file)
--- a/test/chacha_internal_test.c
+++ b/test/chacha_internal_test.c
@@ -17,7 +17,7 @@
 #include "testutil.h"
 #include "crypto/chacha.h"
 #if defined(__powerpc64__) && !defined(OPENSSL_SYS_AIX) && !defined(OPENSSL_SYS_MACOSX)
-#include "crypto/ppc_arch.h"
+#include "arch/ppc_arch.h"
 #endif
 
 static const unsigned int key[] = {

diff --git a/test/rdcpu_sanitytest.c b/test/rdcpu_sanitytest.c
index e76b94b34cfb160fbff64367d3626e1b09ebe932..47c2ea71ca67e1dd6a54a5e5ebf021188a08871d 100644 (file)
--- a/test/rdcpu_sanitytest.c
+++ b/test/rdcpu_sanitytest.c
@@ -23,7 +23,7 @@ size_t OPENSSL_ia32_rdseed_bytes(unsigned char *buf, size_t len);
 
 #if defined(__aarch64__) && defined(OPENSSL_CPUID_OBJ)
 #define IS_AARCH_64 1
-#include "arm_arch.h"
+#include "arch/arm_arch.h"
 
 size_t OPENSSL_rndr_bytes(unsigned char *buf, size_t len);
 size_t OPENSSL_rndrrs_bytes(unsigned char *buf, size_t len);