| blob | 5c099c22103c53d7f7685c3c87a7d1764e1284aa |
1 --- misc/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:42:40.000000000 +0200
2 +++ misc/build/db-4.7.25.NC/btree/makefile.mk 2009-07-21 11:39:25.000000000 +0200
3 @@ -1 +1,35 @@
4 -dummy
5 +PRJ=..$/..$/..$/..$/..
6 +
7 +PRJNAME=berkeleydb
8 +TARGET=btree
9 +
10 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
11 +
12 +.INCLUDE : settings.mk
13 +
14 +INCPRE+=..$/build_windows ..$/
15 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
16 +
17 +SLOFILES= \
18 + $(SLO)$/bt_compact.obj \
19 + $(SLO)$/bt_compare.obj \
20 + $(SLO)$/bt_conv.obj \
21 + $(SLO)$/bt_curadj.obj \
22 + $(SLO)$/bt_cursor.obj \
23 + $(SLO)$/bt_delete.obj \
24 + $(SLO)$/bt_method.obj \
25 + $(SLO)$/bt_open.obj \
26 + $(SLO)$/bt_put.obj \
27 + $(SLO)$/bt_rec.obj \
28 + $(SLO)$/bt_reclaim.obj \
29 + $(SLO)$/bt_recno.obj \
30 + $(SLO)$/bt_rsearch.obj \
31 + $(SLO)$/bt_search.obj \
32 + $(SLO)$/bt_split.obj \
33 + $(SLO)$/bt_stat.obj \
34 + $(SLO)$/bt_upgrade.obj \
35 + $(SLO)$/bt_verify.obj \
36 + $(SLO)$/btree_auto.obj
37 +
38 +.INCLUDE : target.mk
39 +
40 --- misc/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:42:40.000000000 +0200
41 +++ misc/build/db-4.7.25.NC/clib/makefile.mk 2009-07-21 11:39:25.000000000 +0200
42 @@ -1 +1,16 @@
43 -dummy
44 +PRJ=..$/..$/..$/..$/..
45 +
46 +PRJNAME=berkeleydb
47 +TARGET=clib
48 +
49 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
50 +
51 +.INCLUDE : settings.mk
52 +
53 +INCPRE+=..$/build_windows ..$/dbinc ..$/
54 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
55 +
56 +SLOFILES= $(SLO)$/strsep.obj
57 +
58 +.INCLUDE : target.mk
59 +
60 --- misc/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:42:40.000000000 +0200
61 +++ misc/build/db-4.7.25.NC/common/makefile.mk 2009-07-21 11:39:25.000000000 +0200
62 @@ -1 +1,31 @@
63 -dummy
64 +PRJ=..$/..$/..$/..$/..
65 +
66 +PRJNAME=berkeleydb
67 +TARGET=common
68 +
69 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
70 +
71 +.INCLUDE : settings.mk
72 +
73 +INCPRE+=..$/build_windows ..$/
74 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
75 +
76 +SLOFILES= \
77 + $(SLO)$/crypto_stub.obj \
78 + $(SLO)$/db_byteorder.obj \
79 + $(SLO)$/db_err.obj \
80 + $(SLO)$/db_getlong.obj \
81 + $(SLO)$/db_idspace.obj \
82 + $(SLO)$/db_log2.obj \
83 + $(SLO)$/db_shash.obj \
84 + $(SLO)$/dbt.obj \
85 + $(SLO)$/mkpath.obj \
86 + $(SLO)$/openflags.obj \
87 + $(SLO)$/os_method.obj \
88 + $(SLO)$/util_cache.obj \
89 + $(SLO)$/util_log.obj \
90 + $(SLO)$/util_sig.obj \
91 + $(SLO)$/zerofill.obj
92 +
93 +.INCLUDE : target.mk
94 +
95 --- misc/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:42:40.000000000 +0200
96 +++ misc/build/db-4.7.25.NC/cxx/makefile.mk 2009-07-21 11:39:25.000000000 +0200
97 @@ -1 +1,27 @@
98 -dummy
99 +PRJ=..$/..$/..$/..$/..
100 +
101 +PRJNAME=berkeleydb
102 +TARGET=cxx
103 +
104 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
105 +
106 +.INCLUDE : settings.mk
107 +
108 +INCPRE+=..$/build_windows ..$/
109 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
110 +
111 +SLOFILES= \
112 + $(SLO)$/cxx_db.obj \
113 + $(SLO)$/cxx_dbc.obj \
114 + $(SLO)$/cxx_dbt.obj \
115 + $(SLO)$/cxx_env.obj \
116 + $(SLO)$/cxx_except.obj \
117 + $(SLO)$/cxx_lock.obj \
118 + $(SLO)$/cxx_logc.obj \
119 + $(SLO)$/cxx_mpool.obj \
120 + $(SLO)$/cxx_multi.obj \
121 + $(SLO)$/cxx_seq.obj \
122 + $(SLO)$/cxx_txn.obj
123 +
124 +.INCLUDE : target.mk
125 +
126 --- misc/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:42:40.000000000 +0200
127 +++ misc/build/db-4.7.25.NC/db/makefile.mk 2009-07-21 11:39:25.000000000 +0200
128 @@ -1 +1,47 @@
129 -dummy
130 +PRJ=..$/..$/..$/..$/..
131 +
132 +PRJNAME=berkeleydb
133 +TARGET=db_src
134 +
135 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
136 +
137 +.INCLUDE : settings.mk
138 +
139 +INCPRE+=..$/build_windows ..$/
140 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
141 +
142 +SLOFILES= \
143 + $(SLO)$/crdel_auto.obj \
144 + $(SLO)$/crdel_rec.obj \
145 + $(SLO)$/db.obj \
146 + $(SLO)$/db_am.obj \
147 + $(SLO)$/db_auto.obj \
148 + $(SLO)$/db_cam.obj \
149 + $(SLO)$/db_cds.obj \
150 + $(SLO)$/db_conv.obj \
151 + $(SLO)$/db_dispatch.obj \
152 + $(SLO)$/db_dup.obj \
153 + $(SLO)$/db_iface.obj \
154 + $(SLO)$/db_join.obj \
155 + $(SLO)$/db_meta.obj \
156 + $(SLO)$/db_method.obj \
157 + $(SLO)$/db_open.obj \
158 + $(SLO)$/db_overflow.obj \
159 + $(SLO)$/db_ovfl_vrfy.obj \
160 + $(SLO)$/db_pr.obj \
161 + $(SLO)$/db_rec.obj \
162 + $(SLO)$/db_reclaim.obj \
163 + $(SLO)$/db_remove.obj \
164 + $(SLO)$/db_rename.obj \
165 + $(SLO)$/db_ret.obj \
166 + $(SLO)$/db_setid.obj \
167 + $(SLO)$/db_setlsn.obj \
168 + $(SLO)$/db_stati.obj \
169 + $(SLO)$/db_truncate.obj \
170 + $(SLO)$/db_upg.obj \
171 + $(SLO)$/db_upg_opd.obj \
172 + $(SLO)$/db_vrfy.obj \
173 + $(SLO)$/db_vrfyutil.obj
174 +
175 +.INCLUDE: target.mk
176 +
177 --- misc/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:42:40.000000000 +0200
178 +++ misc/build/db-4.7.25.NC/db_4_7_gcc4.map 2009-07-21 11:39:25.000000000 +0200
179 @@ -1 +1,147 @@
180 -dummy
181 +DB_4_7 {
182 + global:
183 +__bam_adj_read;
184 +__bam_cadjust_read;
185 +__bam_cdel_read;
186 +__bam_curadj_read;
187 +__bam_merge_44_read;
188 +__bam_merge_read;
189 +__bam_pgno_read;
190 +__bam_relink_read;
191 +__bam_relink_43_read;
192 +__bam_repl_read;
193 +__bam_root_read;
194 +__bam_rcuradj_read;
195 +__bam_rsplit_read;
196 +__bam_split_read;
197 +__config_split;
198 +__crdel_inmem_create_read;
199 +__crdel_inmem_rename_read;
200 +__crdel_inmem_remove_read;
201 +__crdel_metasub_read;
202 +__db_add_recovery_int;
203 +__db_addrem_read;
204 +__db_big_read;
205 +__db_cksum_read;
206 +__db_dbm_close;
207 +__db_dbm_delete;
208 +__db_dbm_fetch;
209 +__db_dbm_firstkey;
210 +__db_dbm_init;
211 +__db_dbm_nextkey;
212 +__db_dbm_store;
213 +__db_debug_read;
214 +__db_dispatch;
215 +__db_dumptree;
216 +__db_hcreate;
217 +__db_hdestroy;
218 +__db_hsearch;
219 +__db_idspace;
220 +__db_mkpath;
221 +__db_ndbm_clearerr;
222 +__db_ndbm_close;
223 +__db_ndbm_delete;
224 +__db_ndbm_dirfno;
225 +__db_ndbm_error;
226 +__db_ndbm_fetch;
227 +__db_ndbm_firstkey;
228 +__db_ndbm_nextkey;
229 +__db_ndbm_open;
230 +__db_ndbm_pagfno;
231 +__db_ndbm_rdonly;
232 +__db_ndbm_store;
233 +__db_noop_read;
234 +__db_pg_alloc_42_read;
235 +__db_pg_alloc_read;
236 +__db_pg_free_42_read;
237 +__db_pg_free_read;
238 +__db_pg_freedata_42_read;
239 +__db_pg_freedata_read;
240 +__db_pg_init_read;
241 +__db_pg_sort_read;
242 +__db_pr_callback;
243 +__db_relink_42_read;
244 +__db_rpath;
245 +__db_getlong;
246 +__db_getulong;
247 +__db_ovref_read;
248 +__dbreg_register_read;
249 +__fop_create_read;
250 +__fop_file_remove_read;
251 +__fop_remove_read;
252 +__fop_rename_read;
253 +__fop_write_read;
254 +__ham_chgpg_read;
255 +__ham_copypage_read;
256 +__ham_curadj_read;
257 +__ham_groupalloc_42_read;
258 +__ham_groupalloc_read;
259 +__ham_insdel_read;
260 +__ham_metagroup_42_read;
261 +__ham_metagroup_read;
262 +__ham_newpage_read;
263 +__ham_replace_read;
264 +__ham_splitdata_read;
265 +__lock_list_print;
266 +__os_abspath;
267 +__os_calloc;
268 +__os_closehandle;
269 +__os_ctime;
270 +__os_dirfree;
271 +__os_dirlist;
272 +__os_free;
273 +__os_fsync;
274 +__os_getenv;
275 +__os_mkdir;
276 +__os_open;
277 +__os_read;
278 +__os_rename;
279 +__os_strdup;
280 +__os_unlink;
281 +__os_write;
282 +__os_yield;
283 +__os_id;
284 +__qam_add_read;
285 +__qam_del_read;
286 +__qam_delext_read;
287 +__qam_incfirst_read;
288 +__qam_mvptr_read;
289 +__txn_ckp_read;
290 +__txn_ckp_42_read;
291 +__txn_child_read;
292 +__txn_recycle_read;
293 +__txn_regop_42_read;
294 +__txn_regop_read;
295 +__txn_xa_regop_read;
296 +db_create;
297 +db_env_create;
298 +db_env_set_func_close;
299 +db_env_set_func_dirfree;
300 +db_env_set_func_dirlist;
301 +db_env_set_func_exists;
302 +db_env_set_func_file_map;
303 +db_env_set_func_free;
304 +db_env_set_func_fsync;
305 +db_env_set_func_ftruncate;
306 +db_env_set_func_ioinfo;
307 +db_env_set_func_malloc;
308 +db_env_set_func_open;
309 +db_env_set_func_pread;
310 +db_env_set_func_pwrite;
311 +db_env_set_func_read;
312 +db_env_set_func_realloc;
313 +db_env_set_func_region_map;
314 +db_env_set_func_rename;
315 +db_env_set_func_seek;
316 +db_env_set_func_unlink;
317 +db_env_set_func_write;
318 +db_env_set_func_yield;
319 +db_sequence_create;
320 +db_strerror;
321 +db_version;
322 +db_xa_switch;
323 +log_compare;
324 +
325 + local:
326 + *;
327 +};
328 --- misc/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:42:40.000000000 +0200
329 +++ misc/build/db-4.7.25.NC/dbm/makefile.mk 2009-07-21 11:39:25.000000000 +0200
330 @@ -1 +1,16 @@
331 -dummy
332 +PRJ=..$/..$/..$/..$/..
333 +
334 +PRJNAME=berkeleydb
335 +TARGET=dbm
336 +
337 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
338 +
339 +.INCLUDE : settings.mk
340 +
341 +INCPRE+=..$/build_windows ..$/
342 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
343 +
344 +SLOFILES= $(SLO)$/dbm.obj
345 +
346 +.INCLUDE : target.mk
347 +
348 --- misc/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:42:40.000000000 +0200
349 +++ misc/build/db-4.7.25.NC/dbreg/makefile.mk 2009-07-21 11:39:25.000000000 +0200
350 @@ -1 +1,21 @@
351 -dummy
352 +PRJ=..$/..$/..$/..$/..
353 +
354 +PRJNAME=berkeleydb
355 +TARGET=dbreg
356 +
357 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
358 +
359 +.INCLUDE : settings.mk
360 +
361 +INCPRE+=..$/build_windows ..$/
362 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
363 +
364 +SLOFILES= \
365 + $(SLO)$/dbreg.obj \
366 + $(SLO)$/dbreg_auto.obj \
367 + $(SLO)$/dbreg_rec.obj \
368 + $(SLO)$/dbreg_stat.obj \
369 + $(SLO)$/dbreg_util.obj
370 +
371 +.INCLUDE : target.mk
372 +
373 --- misc/db-4.7.25.NC/dist/Makefile.in 2008-05-06 05:03:36.000000000 +0200
374 +++ misc/build/db-4.7.25.NC/dist/Makefile.in 2009-07-21 11:39:25.000000000 +0200
375 @@ -13,7 +13,7 @@
376 libdir= @libdir@
377 docdir= $(prefix)/docs
379 -dmode= 755
380 +dmode= 775
381 emode= 555
382 fmode= 444
384 @@ -56,6 +56,7 @@
385 CCLINK= @MAKEFILE_CCLINK@ @CFLAGS@
387 LDFLAGS= @LDFLAGS@
388 +LDFLAGSVERSION= @LDFLAGSVERSION@
389 LIBS= @LIBSO_LIBS@
390 TEST_LIBS= @TEST_LIBS@
391 LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
392 @@ -733,7 +734,7 @@
394 # Shared C library.
395 $(libso_target): $(C_OBJS)
396 - $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
397 + $(SOLINK) $(SOFLAGS) $(LDFLAGS) $(LDFLAGSVERSION) -o $@ $(C_OBJS) $(LIBCSO_LIBS)
398 $(RM) -f $(libdb)
399 $(LN) -s .libs/$(libdb_version) $(libdb)
401 --- misc/db-4.7.25.NC/dist/config.sub
402 +++ misc/build/db-4.7.25.NC/dist/config.sub
403 @@ -120,7 +120,7 @@
404 # Here we must recognize all the valid KERNEL-OS combinations.
405 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
406 case $maybe_os in
407 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
408 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
409 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
410 storm-chaos* | os2-emx* | rtmk-nova*)
411 os=-$maybe_os
412 @@ -1247,7 +1247,7 @@
413 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
414 | -chorusos* | -chorusrdb* \
415 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
416 - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
417 + | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
418 | -uxpv* | -beos* | -mpeix* | -udk* \
419 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
420 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
421 --- misc/db-4.7.25.NC/dist/configure 2008-05-15 23:12:41.000000000 +0200
422 +++ misc/build/db-4.7.25.NC/dist/configure 2009-07-21 11:39:25.000000000 +0200
423 @@ -3757,8 +3757,10 @@
424 # Set CFLAGS/CXXFLAGS. We MUST set the flags before we call autoconf
425 # compiler configuration macros, because if we don't, they set CFLAGS
426 # to no optimization and -g, which isn't what we want.
427 -CFLAGS=${CFLAGS-$optimize_debug}
428 -CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
429 +#CFLAGS=${CFLAGS-$optimize_debug}
430 +#CXXFLAGS=${CXXFLAGS-"$CFLAGS"}
431 +CFLAGS="$CFLAGS $optimize_def"
432 +CXXFLAGS="$CXXFLAGS $CFLAGS"
434 # The default compiler is cc (NOT gcc), the default CFLAGS is as specified
435 # above, NOT what is set by AC_PROG_CC, as it won't set optimization flags
436 @@ -12566,7 +12568,8 @@
437 # Check to see if the program is GNU ld. I'd rather use --version,
438 # but apparently some variants of GNU ld only accept -v.
439 # Break only if it was the GNU/non-GNU ld that we prefer.
440 - case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
441 +# case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
442 + case `$lt_cv_path_LD -v 2>&1 </dev/null` in
443 *GNU* | *'with BFD'*)
444 test "$with_gnu_ld" != no && break
445 ;;
446 @@ -36624,6 +36627,7 @@
447 JAR!$JAR$ac_delim
448 JAVACFLAGS!$JAVACFLAGS$ac_delim
449 LDFLAGS!$LDFLAGS$ac_delim
450 +LDFLAGSVERSION!$LDFLAGSVERSION$ac_delim
451 LIBCSO_LIBS!$LIBCSO_LIBS$ac_delim
452 LIBJSO_LIBS!$LIBJSO_LIBS$ac_delim
453 LIBSO_LIBS!$LIBSO_LIBS$ac_delim
454 @@ -36655,7 +36659,7 @@
455 DB_VERSION_PATCH!$DB_VERSION_PATCH$ac_delim
456 _ACEOF
458 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
459 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then
460 break
461 elif $ac_last_try; then
462 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
463 --- misc/db-4.7.25.NC/dist/ltmain.sh 2006-06-27 03:03:33.000000000 +0200
464 +++ misc/build/db-4.7.25.NC/dist/ltmain.sh 2009-07-21 11:39:25.000000000 +0200
465 @@ -1700,7 +1700,9 @@
466 # We need an absolute path.
467 case $dir in
468 [\\/]* | [A-Za-z]:[\\/]*) ;;
469 - *)
470 + # or $ORIGIN altenatively
471 + *\$ORIGIN*) ;;
472 + *)
473 $echo "$modename: only absolute run-paths are allowed" 1>&2
474 exit $EXIT_FAILURE
475 ;;
476 --- misc/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:42:40.000000000 +0200
477 +++ misc/build/db-4.7.25.NC/env/makefile.mk 2009-07-21 11:39:25.000000000 +0200
478 @@ -1 +1,29 @@
479 -dummy
480 +PRJ=..$/..$/..$/..$/..
481 +
482 +PRJNAME=berkeleydb
483 +TARGET=env
484 +
485 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
486 +
487 +.INCLUDE : settings.mk
488 +
489 +INCPRE+=..$/build_windows ..$/
490 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
491 +
492 +SLOFILES= \
493 + $(SLO)$/env_alloc.obj \
494 + $(SLO)$/env_config.obj \
495 + $(SLO)$/env_failchk.obj \
496 + $(SLO)$/env_file.obj \
497 + $(SLO)$/env_globals.obj \
498 + $(SLO)$/env_method.obj \
499 + $(SLO)$/env_name.obj \
500 + $(SLO)$/env_open.obj \
501 + $(SLO)$/env_recover.obj \
502 + $(SLO)$/env_region.obj \
503 + $(SLO)$/env_register.obj \
504 + $(SLO)$/env_sig.obj \
505 + $(SLO)$/env_stat.obj
506 +
507 +.INCLUDE : target.mk
508 +
509 --- misc/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:42:40.000000000 +0200
510 +++ misc/build/db-4.7.25.NC/fileops/makefile.mk 2009-07-21 11:39:26.000000000 +0200
511 @@ -1 +1,20 @@
512 -dummy
513 +PRJ=..$/..$/..$/..$/..
514 +
515 +PRJNAME=berkeleydb
516 +TARGET=fileops
517 +
518 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
519 +
520 +.INCLUDE : settings.mk
521 +
522 +INCPRE+=..$/build_windows ..$/
523 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
524 +
525 +SLOFILES= \
526 + $(SLO)$/fileops_auto.obj \
527 + $(SLO)$/fop_basic.obj \
528 + $(SLO)$/fop_rec.obj \
529 + $(SLO)$/fop_util.obj
530 +
531 +.INCLUDE : target.mk
532 +
533 --- misc/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:42:40.000000000 +0200
534 +++ misc/build/db-4.7.25.NC/hash/makefile.mk 2009-07-21 11:39:26.000000000 +0200
535 @@ -1 +1,30 @@
536 -dummy
537 +PRJ=..$/..$/..$/..$/..
538 +
539 +PRJNAME=berkeleydb
540 +TARGET=hash
541 +
542 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
543 +
544 +.INCLUDE : settings.mk
545 +
546 +INCPRE+=..$/build_windows ..$/
547 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
548 +
549 +SLOFILES= \
550 + $(SLO)$/hash.obj \
551 + $(SLO)$/hash_auto.obj \
552 + $(SLO)$/hash_conv.obj \
553 + $(SLO)$/hash_dup.obj \
554 + $(SLO)$/hash_func.obj \
555 + $(SLO)$/hash_meta.obj \
556 + $(SLO)$/hash_method.obj \
557 + $(SLO)$/hash_open.obj \
558 + $(SLO)$/hash_page.obj \
559 + $(SLO)$/hash_rec.obj \
560 + $(SLO)$/hash_reclaim.obj \
561 + $(SLO)$/hash_stat.obj \
562 + $(SLO)$/hash_upgrade.obj \
563 + $(SLO)$/hash_verify.obj
564 +
565 +.INCLUDE : target.mk
566 +
567 --- misc/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:42:40.000000000 +0200
568 +++ misc/build/db-4.7.25.NC/hmac/makefile.mk 2009-07-21 11:39:26.000000000 +0200
569 @@ -1 +1,18 @@
570 -dummy
571 +PRJ=..$/..$/..$/..$/..
572 +
573 +PRJNAME=berkeleydb
574 +TARGET=hmac
575 +
576 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
577 +
578 +.INCLUDE : settings.mk
579 +
580 +INCPRE+=..$/build_windows ..$/
581 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
582 +
583 +SLOFILES= \
584 + $(SLO)$/hmac.obj \
585 + $(SLO)$/sha1.obj
586 +
587 +.INCLUDE : target.mk
588 +
589 --- misc/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:42:40.000000000 +0200
590 +++ misc/build/db-4.7.25.NC/hsearch/makefile.mk 2009-07-21 11:39:26.000000000 +0200
591 @@ -1 +1,16 @@
592 -dummy
593 +PRJ=..$/..$/..$/..$/..
594 +
595 +PRJNAME=berkeleydb
596 +TARGET=hsearch
597 +
598 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
599 +
600 +.INCLUDE : settings.mk
601 +
602 +INCPRE+=..$/build_windows ..$/
603 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
604 +
605 +SLOFILES= $(SLO)$/hsearch.obj
606 +
607 +.INCLUDE : target.mk
608 +
609 --- misc/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:42:40.000000000 +0200
610 +++ misc/build/db-4.7.25.NC/lock/makefile.mk 2009-07-21 11:39:26.000000000 +0200
611 @@ -1 +1,26 @@
612 -dummy
613 +PRJ=..$/..$/..$/..$/..
614 +
615 +PRJNAME=berkeleydb
616 +TARGET=lock
617 +
618 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
619 +
620 +.INCLUDE : settings.mk
621 +
622 +INCPRE+=..$/build_windows ..$/
623 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
624 +
625 +SLOFILES= \
626 + $(SLO)$/lock.obj \
627 + $(SLO)$/lock_deadlock.obj \
628 + $(SLO)$/lock_failchk.obj \
629 + $(SLO)$/lock_id.obj \
630 + $(SLO)$/lock_list.obj \
631 + $(SLO)$/lock_method.obj \
632 + $(SLO)$/lock_region.obj \
633 + $(SLO)$/lock_stat.obj \
634 + $(SLO)$/lock_timer.obj \
635 + $(SLO)$/lock_util.obj
636 +
637 +.INCLUDE : target.mk
638 +
639 --- misc/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:42:40.000000000 +0200
640 +++ misc/build/db-4.7.25.NC/log/makefile.mk 2009-07-21 11:39:26.000000000 +0200
641 @@ -1 +1,24 @@
642 -dummy
643 +PRJ=..$/..$/..$/..$/..
644 +
645 +PRJNAME=berkeleydb
646 +TARGET=log
647 +
648 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
649 +
650 +.INCLUDE : settings.mk
651 +
652 +INCPRE+=..$/build_windows ..$/
653 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
654 +
655 +SLOFILES= \
656 + $(SLO)$/log.obj \
657 + $(SLO)$/log_archive.obj \
658 + $(SLO)$/log_compare.obj \
659 + $(SLO)$/log_debug.obj \
660 + $(SLO)$/log_get.obj \
661 + $(SLO)$/log_method.obj \
662 + $(SLO)$/log_put.obj \
663 + $(SLO)$/log_stat.obj
664 +
665 +.INCLUDE : target.mk
666 +
667 --- misc/db-4.7.25.NC/makefile.mk 2009-07-21 11:42:40.000000000 +0200
668 +++ misc/build/db-4.7.25.NC/makefile.mk 2009-07-21 11:39:26.000000000 +0200
669 @@ -1 +1,76 @@
670 -dummy
671 +PRJ=..$/..$/..$/..
672 +PRJNAME=libdb47
673 +TARGET=libdb47
674 +USE_DEFFILE=true
675 +UWINAPILIB=
676 +
677 +.INCLUDE : settings.mk
678 +CFLAGS+=-GS -EHsc -Gy
679 +
680 +#LINKFLAGS!:=$(LINKFLAGS:s/NODEFAULTLIB/NOLOGO/)
681 +
682 +CHILDREN= \
683 + btree clib common cxx \
684 + db dbm dbreg env fileops \
685 + hash hmac hsearch lock \
686 + log mp mutex os os_windows \
687 + qam rep repmgr sequence \
688 + txn xa
689 +
690 +LIB1TARGET= $(SLB)$/$(TARGET).lib
691 +LIB1FILES= \
692 + $(SLB)$/btree.lib \
693 + $(SLB)$/clib.lib \
694 + $(SLB)$/common.lib \
695 + $(SLB)$/cxx.lib \
696 + $(SLB)$/db_src.lib \
697 + $(SLB)$/dbm.lib \
698 + $(SLB)$/dbreg.lib \
699 + $(SLB)$/env.lib \
700 + $(SLB)$/fileops.lib \
701 + $(SLB)$/hash.lib \
702 + $(SLB)$/hmac.lib \
703 + $(SLB)$/hsearch.lib \
704 + $(SLB)$/lock.lib \
705 + $(SLB)$/log.lib \
706 + $(SLB)$/mp.lib \
707 + $(SLB)$/mutex.lib \
708 + $(SLB)$/os.lib \
709 + $(SLB)$/os_windows.lib \
710 + $(SLB)$/qam.lib \
711 + $(SLB)$/rep.lib \
712 + $(SLB)$/repmgr.lib \
713 + $(SLB)$/sequence.lib \
714 + $(SLB)$/txn.lib \
715 + $(SLB)$/xa.lib
716 +
717 +SHL1LIBS=$(LIB1TARGET)
718 +SHL1STDLIBS = $(WS2_32LIB) $(ADVAPI32LIB)
719 +SHL1TARGET = $(TARGET)
720 +SHL1DEF = $(MISC)$/$(SHL1TARGET).def
721 +SHL1IMPLIB = $(SHL1TARGET)
722 +SHL1LIBS = $(SLB)$/$(TARGET).lib
723 +SHL1DEPN = $(CHILDREN)
724 +
725 +#The following line prevents that the resource file is automatically generated
726 +use_shl_versions:=
727 +#use the berkeley's resource file
728 +RCFILES = build_windows$/libdb.rc
729 +SHL1RES= $(RES)$/libdb47.res
730 +
731 +#DEF1NAME=$(SHL1TARGET)
732 +#DEF1EXPORTFILE=$(TARGET).dxp
733 +
734 +# dmake builds the first rule
735 +ALLTAR : $(CHILDREN)
736 +
737 +$(CHILDREN) .PHONY :
738 + cd $@ ; $(MAKECMD) subdmake=true $(MFLAGS) $(CALLMACROS)
739 +
740 +.INCLUDE : target.mk
741 +
742 +$(MISC)$/$(SHL1TARGET).def : build_windows$/libdb.def
743 + $(COPY) $< $@
744 +
745 + #$(DUMPBIN) -DIRECTIVES $(SLB)$/$(TARGET).lib | $(GREP) EXPORT: | $(GREP) -v ",DATA" | $(SED) "s/.*EXPORT://" >> $@
746 +
747 --- misc/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:42:40.000000000 +0200
748 +++ misc/build/db-4.7.25.NC/mp/makefile.mk 2009-07-21 11:39:26.000000000 +0200
749 @@ -1 +1,31 @@
750 -dummy
751 +PRJ=..$/..$/..$/..$/..
752 +
753 +PRJNAME=berkeleydb
754 +TARGET=mp
755 +
756 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
757 +
758 +.INCLUDE : settings.mk
759 +
760 +INCPRE+=..$/build_windows ..$/
761 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
762 +
763 +SLOFILES= \
764 + $(SLO)$/mp_alloc.obj \
765 + $(SLO)$/mp_bh.obj \
766 + $(SLO)$/mp_fget.obj \
767 + $(SLO)$/mp_fmethod.obj \
768 + $(SLO)$/mp_fopen.obj \
769 + $(SLO)$/mp_fput.obj \
770 + $(SLO)$/mp_fset.obj \
771 + $(SLO)$/mp_method.obj \
772 + $(SLO)$/mp_mvcc.obj \
773 + $(SLO)$/mp_region.obj \
774 + $(SLO)$/mp_register.obj \
775 + $(SLO)$/mp_resize.obj \
776 + $(SLO)$/mp_stat.obj \
777 + $(SLO)$/mp_sync.obj \
778 + $(SLO)$/mp_trickle.obj
779 +
780 +.INCLUDE : target.mk
781 +
782 --- misc/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:42:40.000000000 +0200
783 +++ misc/build/db-4.7.25.NC/mutex/makefile.mk 2009-07-21 11:39:26.000000000 +0200
784 @@ -1 +1,23 @@
785 -dummy
786 +
787 +PRJ=..$/..$/..$/..$/..
788 +
789 +PRJNAME=berkeleydb
790 +TARGET=mutex
791 +
792 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
793 +
794 +.INCLUDE : settings.mk
795 +
796 +INCPRE+=-I..$/build_windows -I..$/ -I$(COMPATH)$/include $(PSDKINC)
797 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
798 +
799 +SLOFILES= \
800 + $(SLO)$/mut_alloc.obj \
801 + $(SLO)$/mut_failchk.obj \
802 + $(SLO)$/mut_method.obj \
803 + $(SLO)$/mut_region.obj \
804 + $(SLO)$/mut_stat.obj \
805 + $(SLO)$/mut_win32.obj
806 +
807 +.INCLUDE : target.mk
808 +
809 --- misc/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:42:40.000000000 +0200
810 +++ misc/build/db-4.7.25.NC/os/makefile.mk 2009-07-21 11:39:26.000000000 +0200
811 @@ -1 +1,26 @@
812 -dummy
813 +PRJ=..$/..$/..$/..$/..
814 +
815 +PRJNAME=berkeleydb
816 +TARGET=os
817 +
818 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
819 +
820 +.INCLUDE : settings.mk
821 +
822 +INCPRE+=..$/build_windows ..$/
823 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
824 +
825 +SLOFILES= \
826 + $(SLO)$/os_abort.obj \
827 + $(SLO)$/os_addrinfo.obj \
828 + $(SLO)$/os_alloc.obj \
829 + $(SLO)$/os_ctime.obj \
830 + $(SLO)$/os_pid.obj \
831 + $(SLO)$/os_root.obj \
832 + $(SLO)$/os_rpath.obj \
833 + $(SLO)$/os_stack.obj \
834 + $(SLO)$/os_tmpdir.obj \
835 + $(SLO)$/os_uid.obj
836 +
837 +.INCLUDE : target.mk
838 +
839 --- misc/db-4.7.25.NC/os/os_fsync.c 2008-05-06 05:03:37.000000000 +0200
840 +++ misc/build/db-4.7.25.NC/os/os_fsync.c 2009-07-21 11:42:03.000000000 +0200
841 @@ -79,13 +79,17 @@
842 ret = DB_GLOBAL(j_fsync)(fhp->fd);
843 else {
844 #if defined(F_FULLFSYNC)
845 +/* When running OOo on MacOS using an NFS mounted disk, fcntl failed with errno
846 + ENOTTY (25). Since full sync only works on HFS, FAT and UDF (according to the
847 + man page) and also is more time consuming we just use the fallback.
848 RETRY_CHK((fcntl(fhp->fd, F_FULLFSYNC, 0)), ret);
849 - /*
850 +*/ /*
851 * On OS X, F_FULLSYNC only works on HFS+, so we need to fall
852 * back to regular fsync on other filesystems.
853 */
854 - if (ret == ENOTSUP)
855 - RETRY_CHK((fsync(fhp->fd)), ret);
856 +/* if (ret == ENOTSUP)
857 +*/
858 + RETRY_CHK((fsync(fhp->fd)), ret);
859 #elif defined(HAVE_QNX)
860 ret = __qnx_fsync(fhp);
861 #elif defined(HAVE_FDATASYNC)
862 --- misc/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:42:40.000000000 +0200
863 +++ misc/build/db-4.7.25.NC/os_windows/makefile.mk 2009-07-21 11:39:26.000000000 +0200
864 @@ -1 +1,37 @@
865 -dummy
866 +PRJ=..$/..$/..$/..$/..
867 +
868 +PRJNAME=berkeleydb
869 +TARGET=os_windows
870 +
871 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
872 +
873 +.INCLUDE : settings.mk
874 +
875 +INCPRE+=..$/build_windows ..$/
876 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
877 +
878 +SLOFILES= \
879 + $(SLO)$/os_abs.obj \
880 + $(SLO)$/os_clock.obj \
881 + $(SLO)$/os_config.obj \
882 + $(SLO)$/os_cpu.obj \
883 + $(SLO)$/os_dir.obj \
884 + $(SLO)$/os_errno.obj \
885 + $(SLO)$/os_fid.obj \
886 + $(SLO)$/os_flock.obj \
887 + $(SLO)$/os_fsync.obj \
888 + $(SLO)$/os_getenv.obj \
889 + $(SLO)$/os_handle.obj \
890 + $(SLO)$/os_map.obj \
891 + $(SLO)$/os_mkdir.obj \
892 + $(SLO)$/os_open.obj \
893 + $(SLO)$/os_rename.obj \
894 + $(SLO)$/os_rw.obj \
895 + $(SLO)$/os_seek.obj \
896 + $(SLO)$/os_stat.obj \
897 + $(SLO)$/os_truncate.obj \
898 + $(SLO)$/os_unlink.obj \
899 + $(SLO)$/os_yield.obj \
900 +
901 +.INCLUDE : target.mk
902 +
903 --- misc/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:42:40.000000000 +0200
904 +++ misc/build/db-4.7.25.NC/qam/makefile.mk 2009-07-21 11:39:26.000000000 +0200
905 @@ -1 +1,26 @@
906 -dummy
907 +PRJ=..$/..$/..$/..$/..
908 +
909 +PRJNAME=berkeleydb
910 +TARGET=qam
911 +
912 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
913 +
914 +.INCLUDE : settings.mk
915 +
916 +INCPRE+=..$/build_windows ..$/
917 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
918 +
919 +SLOFILES= \
920 + $(SLO)$/qam.obj \
921 + $(SLO)$/qam_auto.obj \
922 + $(SLO)$/qam_conv.obj \
923 + $(SLO)$/qam_files.obj \
924 + $(SLO)$/qam_method.obj \
925 + $(SLO)$/qam_open.obj \
926 + $(SLO)$/qam_rec.obj \
927 + $(SLO)$/qam_stat.obj \
928 + $(SLO)$/qam_upgrade.obj \
929 + $(SLO)$/qam_verify.obj
930 +
931 +.INCLUDE : target.mk
932 +
933 --- misc/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:42:40.000000000 +0200
934 +++ misc/build/db-4.7.25.NC/rep/makefile.mk 2009-07-21 11:39:26.000000000 +0200
935 @@ -1 +1,27 @@
936 -dummy
937 +PRJ=..$/..$/..$/..$/..
938 +
939 +PRJNAME=berkeleydb
940 +TARGET=rep
941 +
942 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
943 +
944 +.INCLUDE : settings.mk
945 +
946 +INCPRE+=..$/build_windows ..$/
947 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
948 +
949 +SLOFILES= \
950 + $(SLO)$/rep_auto.obj \
951 + $(SLO)$/rep_backup.obj \
952 + $(SLO)$/rep_elect.obj \
953 + $(SLO)$/rep_lease.obj \
954 + $(SLO)$/rep_log.obj \
955 + $(SLO)$/rep_method.obj \
956 + $(SLO)$/rep_record.obj \
957 + $(SLO)$/rep_region.obj \
958 + $(SLO)$/rep_stat.obj \
959 + $(SLO)$/rep_util.obj \
960 + $(SLO)$/rep_verify.obj
961 +
962 +.INCLUDE : target.mk
963 +
964 --- misc/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:42:40.000000000 +0200
965 +++ misc/build/db-4.7.25.NC/repmgr/makefile.mk 2009-07-21 11:39:26.000000000 +0200
966 @@ -1 +1,26 @@
967 -dummy
968 +PRJ=..$/..$/..$/..$/..
969 +
970 +PRJNAME=berkeleydb
971 +TARGET=repmgr
972 +
973 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
974 +
975 +.INCLUDE : settings.mk
976 +
977 +INCPRE+=..$/build_windows ..$/
978 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
979 +
980 +SLOFILES= \
981 + $(SLO)$/repmgr_auto.obj \
982 + $(SLO)$/repmgr_elect.obj \
983 + $(SLO)$/repmgr_method.obj \
984 + $(SLO)$/repmgr_msg.obj \
985 + $(SLO)$/repmgr_net.obj \
986 + $(SLO)$/repmgr_queue.obj \
987 + $(SLO)$/repmgr_sel.obj \
988 + $(SLO)$/repmgr_stat.obj \
989 + $(SLO)$/repmgr_util.obj \
990 + $(SLO)$/repmgr_windows.obj
991 +
992 +.INCLUDE : target.mk
993 +
994 --- misc/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:42:40.000000000 +0200
995 +++ misc/build/db-4.7.25.NC/sequence/makefile.mk 2009-07-21 11:39:26.000000000 +0200
996 @@ -1 +1,18 @@
997 -dummy
998 +PRJ=..$/..$/..$/..$/..
999 +
1000 +PRJNAME=berkeleydb
1001 +TARGET=sequence
1002 +
1003 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
1004 +
1005 +.INCLUDE : settings.mk
1006 +
1007 +INCPRE+=..$/build_windows ..$/
1008 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
1009 +
1010 +SLOFILES= \
1011 + $(SLO)$/seq_stat.obj \
1012 + $(SLO)$/sequence.obj
1013 +
1014 +.INCLUDE : target.mk
1015 +
1016 --- misc/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:42:40.000000000 +0200
1017 +++ misc/build/db-4.7.25.NC/txn/makefile.mk 2009-07-21 11:39:26.000000000 +0200
1018 @@ -1 +1,26 @@
1019 -dummy
1020 +PRJ=..$/..$/..$/..$/..
1021 +
1022 +PRJNAME=berkeleydb
1023 +TARGET=txn
1024 +
1025 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
1026 +
1027 +.INCLUDE : settings.mk
1028 +
1029 +INCPRE+=..$/build_windows ..$/
1030 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
1031 +
1032 +SLOFILES= \
1033 + $(SLO)$/txn.obj \
1034 + $(SLO)$/txn_auto.obj \
1035 + $(SLO)$/txn_chkpt.obj \
1036 + $(SLO)$/txn_failchk.obj \
1037 + $(SLO)$/txn_method.obj \
1038 + $(SLO)$/txn_rec.obj \
1039 + $(SLO)$/txn_recover.obj \
1040 + $(SLO)$/txn_region.obj \
1041 + $(SLO)$/txn_stat.obj \
1042 + $(SLO)$/txn_util.obj
1043 +
1044 +.INCLUDE : target.mk
1045 +
1046 --- misc/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:42:40.000000000 +0200
1047 +++ misc/build/db-4.7.25.NC/xa/makefile.mk 2009-07-21 11:39:26.000000000 +0200
1048 @@ -1 +1,19 @@
1049 -dummy
1050 +PRJ=..$/..$/..$/..$/..
1051 +
1052 +PRJNAME=berkeleydb
1053 +TARGET=xa
1054 +
1055 +EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
1056 +
1057 +.INCLUDE : settings.mk
1058 +
1059 +INCPRE+=..$/build_windows ..$/
1060 +CDEFS+=-D_WINDLL -DUNICODE -D_UNICODE -DDB_CREATE_DLL -D_WINDOWS
1061 +
1062 +SLOFILES= \
1063 + $(SLO)$/xa.obj \
1064 + $(SLO)$/xa_db.obj \
1065 + $(SLO)$/xa_map.obj
1066 +
1067 +.INCLUDE : target.mk
1068 +
1069 --- misc/db-4.7.25.NC/dbinc/mutex_int.h
1070 +++ misc/build/db-4.7.25.NC/dbinc/mutex_int.h
1071 @@ -402,6 +402,25 @@
1073 #ifdef LOAD_ACTUAL_MUTEX_CODE
1074 /* gcc/arm: 0 is clear, 1 is set. */
1075 +#if defined __thumb__
1076 +#define MUTEX_SET(tsl) ({ \
1077 + int __r, __p; \
1078 + __asm__ volatile( \
1079 + ".align 2\n\t" \
1080 + "bx pc\n\t" \
1081 + "nop\n\t" \
1082 + ".arm\n\t" \
1083 + "swpb %0, %2, [%3]\n\t" \
1084 + "eor %0, %0, #1\n\t" \
1085 + "orr %1, pc, #1\n\t" \
1086 + "bx %1\n\t" \
1087 + ".force_thumb" \
1088 + : "=&r" (__r), "=r" (__p) \
1089 + : "r" (1), "r" (tsl) \
1090 + ); \
1091 + __r & 1; \
1092 +})
1093 +#else
1094 #define MUTEX_SET(tsl) ({ \
1095 int __r; \
1096 asm volatile( \
1097 @@ -484,6 +503,7 @@
1098 ); \
1099 __r & 1; \
1100 })
1101 +#endif
1103 #define MUTEX_UNSET(tsl) (*(volatile tsl_t *)(tsl) = 0)
1104 #define MUTEX_INIT(tsl) (MUTEX_UNSET(tsl), 0)