diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libc/stdlib/Makefile.inc | 8 | ||||
-rw-r--r-- | src/lib/libssl/crypto/arch/m68k/opensslconf.h | 273 |
2 files changed, 3 insertions, 278 deletions
diff --git a/src/lib/libc/stdlib/Makefile.inc b/src/lib/libc/stdlib/Makefile.inc index d75fe5f7b1..953c53382f 100644 --- a/src/lib/libc/stdlib/Makefile.inc +++ b/src/lib/libc/stdlib/Makefile.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile.inc,v 1.48 2013/06/05 04:06:08 guenther Exp $ | 1 | # $OpenBSD: Makefile.inc,v 1.49 2014/03/18 22:36:29 miod Exp $ |
2 | 2 | ||
3 | # stdlib sources | 3 | # stdlib sources |
4 | .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/stdlib ${LIBCSRCDIR}/stdlib | 4 | .PATH: ${LIBCSRCDIR}/arch/${MACHINE_CPU}/stdlib ${LIBCSRCDIR}/stdlib |
@@ -12,9 +12,7 @@ SRCS+= a64l.c abort.c atexit.c atoi.c atof.c atol.c atoll.c bsearch.c \ | |||
12 | tfind.c tsearch.c _rand48.c drand48.c erand48.c jrand48.c lcong48.c \ | 12 | tfind.c tsearch.c _rand48.c drand48.c erand48.c jrand48.c lcong48.c \ |
13 | lrand48.c mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c _Exit.c | 13 | lrand48.c mrand48.c nrand48.c seed48.c srand48.c qabs.c qdiv.c _Exit.c |
14 | 14 | ||
15 | .if (${MACHINE_CPU} == "m68k") | 15 | .if (${MACHINE_CPU} == "i386") |
16 | SRCS+= abs.S div.c labs.c ldiv.c | ||
17 | .elif (${MACHINE_CPU} == "i386") | ||
18 | SRCS+= abs.S div.S labs.S ldiv.S | 16 | SRCS+= abs.S div.S labs.S ldiv.S |
19 | .elif (${MACHINE_CPU} == "vax") | 17 | .elif (${MACHINE_CPU} == "vax") |
20 | SRCS+= abs.c div.c labs.c ldiv.c | 18 | SRCS+= abs.c div.c labs.c ldiv.c |
@@ -25,7 +23,7 @@ SRCS+= abs.c div.c labs.c ldiv.c | |||
25 | SRCS+= abs.c div.c labs.c ldiv.c | 23 | SRCS+= abs.c div.c labs.c ldiv.c |
26 | .endif | 24 | .endif |
27 | 25 | ||
28 | .if (${MACHINE_CPU} == "vax") || (${MACHINE_CPU} == "m68k") | 26 | .if (${MACHINE_CPU} == "vax") |
29 | SRCS+= insque.S remque.S | 27 | SRCS+= insque.S remque.S |
30 | .else | 28 | .else |
31 | SRCS+= insque.c remque.c | 29 | SRCS+= insque.c remque.c |
diff --git a/src/lib/libssl/crypto/arch/m68k/opensslconf.h b/src/lib/libssl/crypto/arch/m68k/opensslconf.h deleted file mode 100644 index fc5ea38470..0000000000 --- a/src/lib/libssl/crypto/arch/m68k/opensslconf.h +++ /dev/null | |||
@@ -1,273 +0,0 @@ | |||
1 | /* opensslconf.h */ | ||
2 | /* WARNING: Generated automatically from opensslconf.h.in by Configure. */ | ||
3 | |||
4 | /* OpenSSL was configured with the following options: */ | ||
5 | #ifndef OPENSSL_DOING_MAKEDEPEND | ||
6 | |||
7 | |||
8 | #ifndef OPENSSL_NO_CAMELLIA | ||
9 | # define OPENSSL_NO_CAMELLIA | ||
10 | #endif | ||
11 | #ifndef OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
12 | # define OPENSSL_NO_EC_NISTP_64_GCC_128 | ||
13 | #endif | ||
14 | #ifndef OPENSSL_NO_CMS | ||
15 | # define OPENSSL_NO_CMS | ||
16 | #endif | ||
17 | #ifndef OPENSSL_NO_GMP | ||
18 | # define OPENSSL_NO_GMP | ||
19 | #endif | ||
20 | #ifndef OPENSSL_NO_GOST | ||
21 | # define OPENSSL_NO_GOST | ||
22 | #endif | ||
23 | #ifndef OPENSSL_NO_JPAKE | ||
24 | # define OPENSSL_NO_JPAKE | ||
25 | #endif | ||
26 | #ifndef OPENSSL_NO_KRB5 | ||
27 | # define OPENSSL_NO_KRB5 | ||
28 | #endif | ||
29 | #ifndef OPENSSL_NO_MD2 | ||
30 | # define OPENSSL_NO_MD2 | ||
31 | #endif | ||
32 | #ifndef OPENSSL_NO_RC5 | ||
33 | # define OPENSSL_NO_RC5 | ||
34 | #endif | ||
35 | #ifndef OPENSSL_NO_RFC3779 | ||
36 | # define OPENSSL_NO_RFC3779 | ||
37 | #endif | ||
38 | #ifndef OPENSSL_NO_SCTP | ||
39 | # define OPENSSL_NO_SCTP | ||
40 | #endif | ||
41 | #ifndef OPENSSL_NO_SEED | ||
42 | # define OPENSSL_NO_SEED | ||
43 | #endif | ||
44 | #ifndef OPENSSL_NO_SRP | ||
45 | # define OPENSSL_NO_SRP | ||
46 | #endif | ||
47 | #ifndef OPENSSL_NO_SSL2 | ||
48 | # define OPENSSL_NO_SSL2 | ||
49 | #endif | ||
50 | #ifndef OPENSSL_NO_STORE | ||
51 | # define OPENSSL_NO_STORE | ||
52 | #endif | ||
53 | |||
54 | #endif /* OPENSSL_DOING_MAKEDEPEND */ | ||
55 | |||
56 | #ifndef OPENSSL_THREADS | ||
57 | # define OPENSSL_THREADS | ||
58 | #endif | ||
59 | #ifndef OPENSSL_NO_DYNAMIC_ENGINE | ||
60 | # define OPENSSL_NO_DYNAMIC_ENGINE | ||
61 | #endif | ||
62 | |||
63 | /* The OPENSSL_NO_* macros are also defined as NO_* if the application | ||
64 | asks for it. This is a transient feature that is provided for those | ||
65 | who haven't had the time to do the appropriate changes in their | ||
66 | applications. */ | ||
67 | #ifdef OPENSSL_ALGORITHM_DEFINES | ||
68 | # if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA) | ||
69 | # define NO_CAMELLIA | ||
70 | # endif | ||
71 | # if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128) | ||
72 | # define NO_EC_NISTP_64_GCC_128 | ||
73 | # endif | ||
74 | # if defined(OPENSSL_NO_CMS) && !defined(NO_CMS) | ||
75 | # define NO_CMS | ||
76 | # endif | ||
77 | # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP) | ||
78 | # define NO_GMP | ||
79 | # endif | ||
80 | # if defined(OPENSSL_NO_GOST) && !defined(NO_GOST) | ||
81 | # define NO_GOST | ||
82 | # endif | ||
83 | # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE) | ||
84 | # define NO_JPAKE | ||
85 | # endif | ||
86 | # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5) | ||
87 | # define NO_KRB5 | ||
88 | # endif | ||
89 | # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2) | ||
90 | # define NO_MD2 | ||
91 | # endif | ||
92 | # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5) | ||
93 | # define NO_RC5 | ||
94 | # endif | ||
95 | # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779) | ||
96 | # define NO_RFC3779 | ||
97 | # endif | ||
98 | # if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP) | ||
99 | # define NO_SCTP | ||
100 | # endif | ||
101 | # if defined(OPENSSL_NO_SEED) && !defined(NO_SEED) | ||
102 | # define NO_SEED | ||
103 | # endif | ||
104 | # if defined(OPENSSL_NO_SRP) && !defined(NO_SRP) | ||
105 | # define NO_SRP | ||
106 | # endif | ||
107 | # if defined(OPENSSL_NO_SSL2) && !defined(NO_SSL2) | ||
108 | # define NO_SSL2 | ||
109 | # endif | ||
110 | # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE) | ||
111 | # define NO_STORE | ||
112 | # endif | ||
113 | #endif | ||
114 | |||
115 | /* crypto/opensslconf.h.in */ | ||
116 | |||
117 | /* Generate 80386 code? */ | ||
118 | #undef I386_ONLY | ||
119 | |||
120 | #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */ | ||
121 | #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR) | ||
122 | #define ENGINESDIR "/usr/lib/engines" | ||
123 | #define OPENSSLDIR "/etc/ssl" | ||
124 | #endif | ||
125 | #endif | ||
126 | |||
127 | #undef OPENSSL_UNISTD | ||
128 | #define OPENSSL_UNISTD <unistd.h> | ||
129 | |||
130 | #undef OPENSSL_EXPORT_VAR_AS_FUNCTION | ||
131 | |||
132 | #if defined(HEADER_IDEA_H) && !defined(IDEA_INT) | ||
133 | #define IDEA_INT unsigned int | ||
134 | #endif | ||
135 | |||
136 | #if defined(HEADER_MD2_H) && !defined(MD2_INT) | ||
137 | #define MD2_INT unsigned int | ||
138 | #endif | ||
139 | |||
140 | #if defined(HEADER_RC2_H) && !defined(RC2_INT) | ||
141 | /* I need to put in a mod for the alpha - eay */ | ||
142 | #define RC2_INT unsigned int | ||
143 | #endif | ||
144 | |||
145 | #if defined(HEADER_RC4_H) | ||
146 | #if !defined(RC4_INT) | ||
147 | /* using int types make the structure larger but make the code faster | ||
148 | * on most boxes I have tested - up to %20 faster. */ | ||
149 | /* | ||
150 | * I don't know what does "most" mean, but declaring "int" is a must on: | ||
151 | * - Intel P6 because partial register stalls are very expensive; | ||
152 | * - elder Alpha because it lacks byte load/store instructions; | ||
153 | */ | ||
154 | #define RC4_INT unsigned int | ||
155 | #endif | ||
156 | #if !defined(RC4_CHUNK) | ||
157 | /* | ||
158 | * This enables code handling data aligned at natural CPU word | ||
159 | * boundary. See crypto/rc4/rc4_enc.c for further details. | ||
160 | */ | ||
161 | #undef RC4_CHUNK | ||
162 | #endif | ||
163 | #endif | ||
164 | |||
165 | #if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG) | ||
166 | /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a | ||
167 | * %20 speed up (longs are 8 bytes, int's are 4). */ | ||
168 | #ifndef DES_LONG | ||
169 | #define DES_LONG unsigned int | ||
170 | #endif | ||
171 | #endif | ||
172 | |||
173 | #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) | ||
174 | #define CONFIG_HEADER_BN_H | ||
175 | #define BN_LLONG | ||
176 | |||
177 | /* Should we define BN_DIV2W here? */ | ||
178 | |||
179 | /* Only one for the following should be defined */ | ||
180 | /* The prime number generation stuff may not work when | ||
181 | * EIGHT_BIT but I don't care since I've only used this mode | ||
182 | * for debuging the bignum libraries */ | ||
183 | #undef SIXTY_FOUR_BIT_LONG | ||
184 | #undef SIXTY_FOUR_BIT | ||
185 | #define THIRTY_TWO_BIT | ||
186 | #undef SIXTEEN_BIT | ||
187 | #undef EIGHT_BIT | ||
188 | #endif | ||
189 | |||
190 | #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H) | ||
191 | #define CONFIG_HEADER_RC4_LOCL_H | ||
192 | /* if this is defined data[i] is used instead of *data, this is a %20 | ||
193 | * speedup on x86 */ | ||
194 | #define RC4_INDEX | ||
195 | #endif | ||
196 | |||
197 | #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H) | ||
198 | #define CONFIG_HEADER_BF_LOCL_H | ||
199 | #undef BF_PTR | ||
200 | #endif /* HEADER_BF_LOCL_H */ | ||
201 | |||
202 | #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H) | ||
203 | #define CONFIG_HEADER_DES_LOCL_H | ||
204 | #ifndef DES_DEFAULT_OPTIONS | ||
205 | /* the following is tweaked from a config script, that is why it is a | ||
206 | * protected undef/define */ | ||
207 | #ifndef DES_PTR | ||
208 | #undef DES_PTR | ||
209 | #endif | ||
210 | |||
211 | /* This helps C compiler generate the correct code for multiple functional | ||
212 | * units. It reduces register dependancies at the expense of 2 more | ||
213 | * registers */ | ||
214 | #ifndef DES_RISC1 | ||
215 | #undef DES_RISC1 | ||
216 | #endif | ||
217 | |||
218 | #ifndef DES_RISC2 | ||
219 | #undef DES_RISC2 | ||
220 | #endif | ||
221 | |||
222 | #if defined(DES_RISC1) && defined(DES_RISC2) | ||
223 | YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!! | ||
224 | #endif | ||
225 | |||
226 | /* Unroll the inner loop, this sometimes helps, sometimes hinders. | ||
227 | * Very mucy CPU dependant */ | ||
228 | #ifndef DES_UNROLL | ||
229 | #define DES_UNROLL | ||
230 | #endif | ||
231 | |||
232 | /* These default values were supplied by | ||
233 | * Peter Gutman <pgut001@cs.auckland.ac.nz> | ||
234 | * They are only used if nothing else has been defined */ | ||
235 | #if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL) | ||
236 | /* Special defines which change the way the code is built depending on the | ||
237 | CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find | ||
238 | even newer MIPS CPU's, but at the moment one size fits all for | ||
239 | optimization options. Older Sparc's work better with only UNROLL, but | ||
240 | there's no way to tell at compile time what it is you're running on */ | ||
241 | |||
242 | #if defined( sun ) /* Newer Sparc's */ | ||
243 | # define DES_PTR | ||
244 | # define DES_RISC1 | ||
245 | # define DES_UNROLL | ||
246 | #elif defined( __ultrix ) /* Older MIPS */ | ||
247 | # define DES_PTR | ||
248 | # define DES_RISC2 | ||
249 | # define DES_UNROLL | ||
250 | #elif defined( __osf1__ ) /* Alpha */ | ||
251 | # define DES_PTR | ||
252 | # define DES_RISC2 | ||
253 | #elif defined ( _AIX ) /* RS6000 */ | ||
254 | /* Unknown */ | ||
255 | #elif defined( __hpux ) /* HP-PA */ | ||
256 | /* Unknown */ | ||
257 | #elif defined( __aux ) /* 68K */ | ||
258 | /* Unknown */ | ||
259 | #elif defined( __dgux ) /* 88K (but P6 in latest boxes) */ | ||
260 | # define DES_UNROLL | ||
261 | #elif defined( __sgi ) /* Newer MIPS */ | ||
262 | # define DES_PTR | ||
263 | # define DES_RISC2 | ||
264 | # define DES_UNROLL | ||
265 | #elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */ | ||
266 | # define DES_PTR | ||
267 | # define DES_RISC1 | ||
268 | # define DES_UNROLL | ||
269 | #endif /* Systems-specific speed defines */ | ||
270 | #endif | ||
271 | |||
272 | #endif /* DES_DEFAULT_OPTIONS */ | ||
273 | #endif /* HEADER_DES_LOCL_H */ | ||