From fde752e948367230a8d92f491d4c85b03c9dcb82 Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Thu, 5 Jun 2025 11:17:57 +0200 Subject: sync opensslconf.h: remove DES_RISC* logic Change-Id: I6a6a696436b84c468fe7fc86f7f026918c68bf6f --- include/arch/loongarch64/opensslconf.h | 55 ---------------------------------- include/arch/mips/opensslconf.h | 55 ---------------------------------- 2 files changed, 110 deletions(-) (limited to 'include') diff --git a/include/arch/loongarch64/opensslconf.h b/include/arch/loongarch64/opensslconf.h index 02ef2b7..540e2a8 100644 --- a/include/arch/loongarch64/opensslconf.h +++ b/include/arch/loongarch64/opensslconf.h @@ -85,66 +85,11 @@ #undef DES_PTR #endif -/* This helps C compiler generate the correct code for multiple functional - * units. It reduces register dependencies at the expense of 2 more - * registers */ -#ifndef DES_RISC1 -#undef DES_RISC1 -#endif - -#ifndef DES_RISC2 -#undef DES_RISC2 -#endif - -#if defined(DES_RISC1) && defined(DES_RISC2) -YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! -#endif - /* Unroll the inner loop, this sometimes helps, sometimes hinders. * Very much CPU dependent */ #ifndef DES_UNROLL #define DES_UNROLL #endif -/* These default values were supplied by - * Peter Gutman - * They are only used if nothing else has been defined */ -#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) -/* Special defines which change the way the code is built depending on the - CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find - even newer MIPS CPU's, but at the moment one size fits all for - optimization options. Older Sparc's work better with only UNROLL, but - there's no way to tell at compile time what it is you're running on */ - -#if defined( sun ) /* Newer Sparc's */ -# define DES_PTR -# define DES_RISC1 -# define DES_UNROLL -#elif defined( __ultrix ) /* Older MIPS */ -# define DES_PTR -# define DES_RISC2 -# define DES_UNROLL -#elif defined( __osf1__ ) /* Alpha */ -# define DES_PTR -# define DES_RISC2 -#elif defined ( _AIX ) /* RS6000 */ - /* Unknown */ -#elif defined( __hpux ) /* HP-PA */ - /* Unknown */ -#elif defined( __aux ) /* 68K */ - /* Unknown */ -#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ -# define DES_UNROLL -#elif defined( __sgi ) /* Newer MIPS */ -# define DES_PTR -# define DES_RISC2 -# define DES_UNROLL -#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ -# define DES_PTR -# define DES_RISC1 -# define DES_UNROLL -#endif /* Systems-specific speed defines */ -#endif - #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ diff --git a/include/arch/mips/opensslconf.h b/include/arch/mips/opensslconf.h index 4fb2f08..5c09d6a 100644 --- a/include/arch/mips/opensslconf.h +++ b/include/arch/mips/opensslconf.h @@ -85,66 +85,11 @@ #undef DES_PTR #endif -/* This helps C compiler generate the correct code for multiple functional - * units. It reduces register dependencies at the expense of 2 more - * registers */ -#ifndef DES_RISC1 -#undef DES_RISC1 -#endif - -#ifndef DES_RISC2 -#undef DES_RISC2 -#endif - -#if defined(DES_RISC1) && defined(DES_RISC2) -YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! -#endif - /* Unroll the inner loop, this sometimes helps, sometimes hinders. * Very much CPU dependent */ #ifndef DES_UNROLL #define DES_UNROLL #endif -/* These default values were supplied by - * Peter Gutman - * They are only used if nothing else has been defined */ -#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) -/* Special defines which change the way the code is built depending on the - CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find - even newer MIPS CPU's, but at the moment one size fits all for - optimization options. Older Sparc's work better with only UNROLL, but - there's no way to tell at compile time what it is you're running on */ - -#if defined( sun ) /* Newer Sparc's */ -# define DES_PTR -# define DES_RISC1 -# define DES_UNROLL -#elif defined( __ultrix ) /* Older MIPS */ -# define DES_PTR -# define DES_RISC2 -# define DES_UNROLL -#elif defined( __osf1__ ) /* Alpha */ -# define DES_PTR -# define DES_RISC2 -#elif defined ( _AIX ) /* RS6000 */ - /* Unknown */ -#elif defined( __hpux ) /* HP-PA */ - /* Unknown */ -#elif defined( __aux ) /* 68K */ - /* Unknown */ -#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ -# define DES_UNROLL -#elif defined( __sgi ) /* Newer MIPS */ -# define DES_PTR -# define DES_RISC2 -# define DES_UNROLL -#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ -# define DES_PTR -# define DES_RISC1 -# define DES_UNROLL -#endif /* Systems-specific speed defines */ -#endif - #endif /* DES_DEFAULT_OPTIONS */ #endif /* HEADER_DES_LOCL_H */ -- cgit v1.2.3-55-g6feb