diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/arch/aarch64/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/alpha/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/amd64/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/arm/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/hppa/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/i386/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/m88k/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/mips64/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/powerpc/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/powerpc64/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/riscv64/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/sh/opensslconf.h | 55 | ||||
| -rw-r--r-- | src/lib/libcrypto/arch/sparc64/opensslconf.h | 55 |
13 files changed, 0 insertions, 715 deletions
diff --git a/src/lib/libcrypto/arch/aarch64/opensslconf.h b/src/lib/libcrypto/arch/aarch64/opensslconf.h index 02ef2b73a1..540e2a883a 100644 --- a/src/lib/libcrypto/arch/aarch64/opensslconf.h +++ b/src/lib/libcrypto/arch/aarch64/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #undef DES_PTR | 85 | #undef DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/alpha/opensslconf.h b/src/lib/libcrypto/arch/alpha/opensslconf.h index 331f7a0978..fd0c0cac7f 100644 --- a/src/lib/libcrypto/arch/alpha/opensslconf.h +++ b/src/lib/libcrypto/arch/alpha/opensslconf.h | |||
| @@ -83,66 +83,11 @@ | |||
| 83 | #define DES_PTR | 83 | #define DES_PTR |
| 84 | #endif | 84 | #endif |
| 85 | 85 | ||
| 86 | /* This helps C compiler generate the correct code for multiple functional | ||
| 87 | * units. It reduces register dependencies at the expense of 2 more | ||
| 88 | * registers */ | ||
| 89 | #ifndef DES_RISC1 | ||
| 90 | #undef DES_RISC1 | ||
| 91 | #endif | ||
| 92 | |||
| 93 | #ifndef DES_RISC2 | ||
| 94 | #define DES_RISC2 | ||
| 95 | #endif | ||
| 96 | |||
| 97 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 98 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 99 | #endif | ||
| 100 | |||
| 101 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 86 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 102 | * Very much CPU dependent */ | 87 | * Very much CPU dependent */ |
| 103 | #ifndef DES_UNROLL | 88 | #ifndef DES_UNROLL |
| 104 | #undef DES_UNROLL | 89 | #undef DES_UNROLL |
| 105 | #endif | 90 | #endif |
| 106 | 91 | ||
| 107 | /* These default values were supplied by | ||
| 108 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 109 | * They are only used if nothing else has been defined */ | ||
| 110 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 111 | /* Special defines which change the way the code is built depending on the | ||
| 112 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 113 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 114 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 115 | there's no way to tell at compile time what it is you're running on */ | ||
| 116 | |||
| 117 | #if defined( sun ) /* Newer Sparc's */ | ||
| 118 | # define DES_PTR | ||
| 119 | # define DES_RISC1 | ||
| 120 | # define DES_UNROLL | ||
| 121 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 122 | # define DES_PTR | ||
| 123 | # define DES_RISC2 | ||
| 124 | # define DES_UNROLL | ||
| 125 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 126 | # define DES_PTR | ||
| 127 | # define DES_RISC2 | ||
| 128 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 129 | /* Unknown */ | ||
| 130 | #elif defined( __hpux ) /* HP-PA */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __aux ) /* 68K */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 135 | # define DES_UNROLL | ||
| 136 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 137 | # define DES_PTR | ||
| 138 | # define DES_RISC2 | ||
| 139 | # define DES_UNROLL | ||
| 140 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 141 | # define DES_PTR | ||
| 142 | # define DES_RISC1 | ||
| 143 | # define DES_UNROLL | ||
| 144 | #endif /* Systems-specific speed defines */ | ||
| 145 | #endif | ||
| 146 | |||
| 147 | #endif /* DES_DEFAULT_OPTIONS */ | 92 | #endif /* DES_DEFAULT_OPTIONS */ |
| 148 | #endif /* HEADER_DES_LOCL_H */ | 93 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/amd64/opensslconf.h b/src/lib/libcrypto/arch/amd64/opensslconf.h index e4868597f2..fbcc122f48 100644 --- a/src/lib/libcrypto/arch/amd64/opensslconf.h +++ b/src/lib/libcrypto/arch/amd64/opensslconf.h | |||
| @@ -80,66 +80,11 @@ | |||
| 80 | #undef DES_PTR | 80 | #undef DES_PTR |
| 81 | #endif | 81 | #endif |
| 82 | 82 | ||
| 83 | /* This helps C compiler generate the correct code for multiple functional | ||
| 84 | * units. It reduces register dependencies at the expense of 2 more | ||
| 85 | * registers */ | ||
| 86 | #ifndef DES_RISC1 | ||
| 87 | #undef DES_RISC1 | ||
| 88 | #endif | ||
| 89 | |||
| 90 | #ifndef DES_RISC2 | ||
| 91 | #undef DES_RISC2 | ||
| 92 | #endif | ||
| 93 | |||
| 94 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 95 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 96 | #endif | ||
| 97 | |||
| 98 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 83 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 99 | * Very much CPU dependent */ | 84 | * Very much CPU dependent */ |
| 100 | #ifndef DES_UNROLL | 85 | #ifndef DES_UNROLL |
| 101 | #define DES_UNROLL | 86 | #define DES_UNROLL |
| 102 | #endif | 87 | #endif |
| 103 | 88 | ||
| 104 | /* These default values were supplied by | ||
| 105 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 106 | * They are only used if nothing else has been defined */ | ||
| 107 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 108 | /* Special defines which change the way the code is built depending on the | ||
| 109 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 110 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 111 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 112 | there's no way to tell at compile time what it is you're running on */ | ||
| 113 | |||
| 114 | #if defined( sun ) /* Newer Sparc's */ | ||
| 115 | # define DES_PTR | ||
| 116 | # define DES_RISC1 | ||
| 117 | # define DES_UNROLL | ||
| 118 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 119 | # define DES_PTR | ||
| 120 | # define DES_RISC2 | ||
| 121 | # define DES_UNROLL | ||
| 122 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 123 | # define DES_PTR | ||
| 124 | # define DES_RISC2 | ||
| 125 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 126 | /* Unknown */ | ||
| 127 | #elif defined( __hpux ) /* HP-PA */ | ||
| 128 | /* Unknown */ | ||
| 129 | #elif defined( __aux ) /* 68K */ | ||
| 130 | /* Unknown */ | ||
| 131 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 132 | # define DES_UNROLL | ||
| 133 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 134 | # define DES_PTR | ||
| 135 | # define DES_RISC2 | ||
| 136 | # define DES_UNROLL | ||
| 137 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 138 | # define DES_PTR | ||
| 139 | # define DES_RISC1 | ||
| 140 | # define DES_UNROLL | ||
| 141 | #endif /* Systems-specific speed defines */ | ||
| 142 | #endif | ||
| 143 | |||
| 144 | #endif /* DES_DEFAULT_OPTIONS */ | 89 | #endif /* DES_DEFAULT_OPTIONS */ |
| 145 | #endif /* HEADER_DES_LOCL_H */ | 90 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/arm/opensslconf.h b/src/lib/libcrypto/arch/arm/opensslconf.h index 4fb2f080e6..5c09d6a158 100644 --- a/src/lib/libcrypto/arch/arm/opensslconf.h +++ b/src/lib/libcrypto/arch/arm/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #undef DES_PTR | 85 | #undef DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/hppa/opensslconf.h b/src/lib/libcrypto/arch/hppa/opensslconf.h index 4fb2f080e6..5c09d6a158 100644 --- a/src/lib/libcrypto/arch/hppa/opensslconf.h +++ b/src/lib/libcrypto/arch/hppa/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #undef DES_PTR | 85 | #undef DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/i386/opensslconf.h b/src/lib/libcrypto/arch/i386/opensslconf.h index 54a8517954..a841ce590b 100644 --- a/src/lib/libcrypto/arch/i386/opensslconf.h +++ b/src/lib/libcrypto/arch/i386/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #define DES_PTR | 85 | #define DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #define DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/m88k/opensslconf.h b/src/lib/libcrypto/arch/m88k/opensslconf.h index 4fb2f080e6..5c09d6a158 100644 --- a/src/lib/libcrypto/arch/m88k/opensslconf.h +++ b/src/lib/libcrypto/arch/m88k/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #undef DES_PTR | 85 | #undef DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/mips64/opensslconf.h b/src/lib/libcrypto/arch/mips64/opensslconf.h index 52da151be2..8b92729d33 100644 --- a/src/lib/libcrypto/arch/mips64/opensslconf.h +++ b/src/lib/libcrypto/arch/mips64/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #define DES_PTR | 85 | #define DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #define DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #undef DES_UNROLL | 91 | #undef DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/powerpc/opensslconf.h b/src/lib/libcrypto/arch/powerpc/opensslconf.h index 4fb2f080e6..5c09d6a158 100644 --- a/src/lib/libcrypto/arch/powerpc/opensslconf.h +++ b/src/lib/libcrypto/arch/powerpc/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #undef DES_PTR | 85 | #undef DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/powerpc64/opensslconf.h b/src/lib/libcrypto/arch/powerpc64/opensslconf.h index e4868597f2..fbcc122f48 100644 --- a/src/lib/libcrypto/arch/powerpc64/opensslconf.h +++ b/src/lib/libcrypto/arch/powerpc64/opensslconf.h | |||
| @@ -80,66 +80,11 @@ | |||
| 80 | #undef DES_PTR | 80 | #undef DES_PTR |
| 81 | #endif | 81 | #endif |
| 82 | 82 | ||
| 83 | /* This helps C compiler generate the correct code for multiple functional | ||
| 84 | * units. It reduces register dependencies at the expense of 2 more | ||
| 85 | * registers */ | ||
| 86 | #ifndef DES_RISC1 | ||
| 87 | #undef DES_RISC1 | ||
| 88 | #endif | ||
| 89 | |||
| 90 | #ifndef DES_RISC2 | ||
| 91 | #undef DES_RISC2 | ||
| 92 | #endif | ||
| 93 | |||
| 94 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 95 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 96 | #endif | ||
| 97 | |||
| 98 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 83 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 99 | * Very much CPU dependent */ | 84 | * Very much CPU dependent */ |
| 100 | #ifndef DES_UNROLL | 85 | #ifndef DES_UNROLL |
| 101 | #define DES_UNROLL | 86 | #define DES_UNROLL |
| 102 | #endif | 87 | #endif |
| 103 | 88 | ||
| 104 | /* These default values were supplied by | ||
| 105 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 106 | * They are only used if nothing else has been defined */ | ||
| 107 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 108 | /* Special defines which change the way the code is built depending on the | ||
| 109 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 110 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 111 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 112 | there's no way to tell at compile time what it is you're running on */ | ||
| 113 | |||
| 114 | #if defined( sun ) /* Newer Sparc's */ | ||
| 115 | # define DES_PTR | ||
| 116 | # define DES_RISC1 | ||
| 117 | # define DES_UNROLL | ||
| 118 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 119 | # define DES_PTR | ||
| 120 | # define DES_RISC2 | ||
| 121 | # define DES_UNROLL | ||
| 122 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 123 | # define DES_PTR | ||
| 124 | # define DES_RISC2 | ||
| 125 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 126 | /* Unknown */ | ||
| 127 | #elif defined( __hpux ) /* HP-PA */ | ||
| 128 | /* Unknown */ | ||
| 129 | #elif defined( __aux ) /* 68K */ | ||
| 130 | /* Unknown */ | ||
| 131 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 132 | # define DES_UNROLL | ||
| 133 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 134 | # define DES_PTR | ||
| 135 | # define DES_RISC2 | ||
| 136 | # define DES_UNROLL | ||
| 137 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 138 | # define DES_PTR | ||
| 139 | # define DES_RISC1 | ||
| 140 | # define DES_UNROLL | ||
| 141 | #endif /* Systems-specific speed defines */ | ||
| 142 | #endif | ||
| 143 | |||
| 144 | #endif /* DES_DEFAULT_OPTIONS */ | 89 | #endif /* DES_DEFAULT_OPTIONS */ |
| 145 | #endif /* HEADER_DES_LOCL_H */ | 90 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/riscv64/opensslconf.h b/src/lib/libcrypto/arch/riscv64/opensslconf.h index 02ef2b73a1..540e2a883a 100644 --- a/src/lib/libcrypto/arch/riscv64/opensslconf.h +++ b/src/lib/libcrypto/arch/riscv64/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #undef DES_PTR | 85 | #undef DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/sh/opensslconf.h b/src/lib/libcrypto/arch/sh/opensslconf.h index 4fb2f080e6..5c09d6a158 100644 --- a/src/lib/libcrypto/arch/sh/opensslconf.h +++ b/src/lib/libcrypto/arch/sh/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #undef DES_PTR | 85 | #undef DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #undef DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #define DES_UNROLL | 91 | #define DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
diff --git a/src/lib/libcrypto/arch/sparc64/opensslconf.h b/src/lib/libcrypto/arch/sparc64/opensslconf.h index 52da151be2..8b92729d33 100644 --- a/src/lib/libcrypto/arch/sparc64/opensslconf.h +++ b/src/lib/libcrypto/arch/sparc64/opensslconf.h | |||
| @@ -85,66 +85,11 @@ | |||
| 85 | #define DES_PTR | 85 | #define DES_PTR |
| 86 | #endif | 86 | #endif |
| 87 | 87 | ||
| 88 | /* This helps C compiler generate the correct code for multiple functional | ||
| 89 | * units. It reduces register dependencies at the expense of 2 more | ||
| 90 | * registers */ | ||
| 91 | #ifndef DES_RISC1 | ||
| 92 | #undef DES_RISC1 | ||
| 93 | #endif | ||
| 94 | |||
| 95 | #ifndef DES_RISC2 | ||
| 96 | #define DES_RISC2 | ||
| 97 | #endif | ||
| 98 | |||
| 99 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
| 100 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | 88 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. |
| 104 | * Very much CPU dependent */ | 89 | * Very much CPU dependent */ |
| 105 | #ifndef DES_UNROLL | 90 | #ifndef DES_UNROLL |
| 106 | #undef DES_UNROLL | 91 | #undef DES_UNROLL |
| 107 | #endif | 92 | #endif |
| 108 | 93 | ||
| 109 | /* These default values were supplied by | ||
| 110 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
| 111 | * They are only used if nothing else has been defined */ | ||
| 112 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
| 113 | /* Special defines which change the way the code is built depending on the | ||
| 114 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
| 115 | even newer MIPS CPU's, but at the moment one size fits all for | ||
| 116 | optimization options. Older Sparc's work better with only UNROLL, but | ||
| 117 | there's no way to tell at compile time what it is you're running on */ | ||
| 118 | |||
| 119 | #if defined( sun ) /* Newer Sparc's */ | ||
| 120 | # define DES_PTR | ||
| 121 | # define DES_RISC1 | ||
| 122 | # define DES_UNROLL | ||
| 123 | #elif defined( __ultrix ) /* Older MIPS */ | ||
| 124 | # define DES_PTR | ||
| 125 | # define DES_RISC2 | ||
| 126 | # define DES_UNROLL | ||
| 127 | #elif defined( __osf1__ ) /* Alpha */ | ||
| 128 | # define DES_PTR | ||
| 129 | # define DES_RISC2 | ||
| 130 | #elif defined ( _AIX ) /* RS6000 */ | ||
| 131 | /* Unknown */ | ||
| 132 | #elif defined( __hpux ) /* HP-PA */ | ||
| 133 | /* Unknown */ | ||
| 134 | #elif defined( __aux ) /* 68K */ | ||
| 135 | /* Unknown */ | ||
| 136 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
| 137 | # define DES_UNROLL | ||
| 138 | #elif defined( __sgi ) /* Newer MIPS */ | ||
| 139 | # define DES_PTR | ||
| 140 | # define DES_RISC2 | ||
| 141 | # define DES_UNROLL | ||
| 142 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
| 143 | # define DES_PTR | ||
| 144 | # define DES_RISC1 | ||
| 145 | # define DES_UNROLL | ||
| 146 | #endif /* Systems-specific speed defines */ | ||
| 147 | #endif | ||
| 148 | |||
| 149 | #endif /* DES_DEFAULT_OPTIONS */ | 94 | #endif /* DES_DEFAULT_OPTIONS */ |
| 150 | #endif /* HEADER_DES_LOCL_H */ | 95 | #endif /* HEADER_DES_LOCL_H */ |
