Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
databases/db5/DESCR Normal file
View File

@@ -0,0 +1,23 @@
Berkeley DB is an embeddable database system that supports keyed access to
data. The software is distributed in source code form, and developers can
compile and link the source code into a single library for inclusion
directly in their applications.
Developers may choose to store data in any of several different storage
structures to satisfy the requirements of a particular application. In
database terminology, these storage structures and the code that operates on
them are called access methods. The library includes support for the
following access methods:
* B+tree: Stores keys in sorted order, using either a programmer-supplied
ordering function or a default function that does lexicographical
ordering of keys. Applications may perform equality or range searches.
* Hashing: Stores records in a hash table for fast searches based on
strict equality. Extended Linear Hashing modifies the hash function
used by the table as new records are inserted, in order to keep buckets
underfull in the steady state.
* Fixed and Variable-Length Records: Stores fixed- or variable-length
records in sequential order. Record numbers may be immutable or
mutable, i.e., permitting new records to be inserted between existing
records or requiring that new records be added only at the end of the
database.

52
databases/db5/Makefile Normal file
View File

@@ -0,0 +1,52 @@
# $NetBSD: Makefile,v 1.12 2013/04/06 19:42:41 rodent Exp $
#
# NOTE:
# When updating this package, a change in the minor (5.n -> 5.(n+1))
# usually incurs a shlib name change. Please make sure to update the
# ABI depends in buildlink3.mk and bump PKGREVISIONs for all dependencies.
# In particular, take care to include BDB_ACCEPTED=db5 packages.
DISTNAME= db-5.3.21
PKGNAME= ${DISTNAME:S/db/db5/}
CATEGORIES= databases
MASTER_SITES= http://download.oracle.com/berkeley-db/ \
http://download-uk.oracle.com/berkeley-db/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.oracle.com/database/berkeley-db/db/index.html
COMMENT= Berkeley DB version 5 from Oracle
LICENSE= sleepycat-public
# NOTE: it is NOT a modified BSD in a common sense:
#LICENSE=
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= pax
GNU_CONFIGURE= yes
CONFIGURE_DIRS= build_unix
CONFIGURE_SCRIPT= ../dist/configure
CONFIGURE_ARGS+= --enable-compat185
CONFIGURE_ARGS+= --enable-cxx
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db5
CONFIGURE_ARGS+= --program-transform-name=s,db_,db5_,
OPSYSVARS+= LIBSO_LIBS
LIBSO_LIBS.SunOS+= -lnsl -lrt
CONFIGURE_ENV+= LIBSO_LIBS=${LIBSO_LIBS:Q}
CHECK_PORTABILITY_SKIP= test/xa/*/*.sh
# DB5 only want pthreads because it's really after POSIX 1003.1
# inter-process mutexes. In this case, we only care to use the native
# threads.
PTHREAD_OPTS+= native
.include "../../mk/pthread.buildlink3.mk"
INSTALLATION_DIRS= include/db5 lib share/doc/db5
post-install:
chown -R ${DOCOWN}:${DOCGRP} ${DESTDIR}${PREFIX}/share/doc/db5
.include "../../mk/bsd.pkg.mk"

5267
databases/db5/PLIST Normal file
View File

File diff suppressed because it is too large Load Diff

25
databases/db5/buildlink3.mk Normal file
View File

@@ -0,0 +1,25 @@
# $NetBSD: buildlink3.mk,v 1.2 2012/01/18 13:46:50 adam Exp $
BUILDLINK_TREE+= db5
.if !defined(DB5_BUILDLINK3_MK)
DB5_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.db5+= db5>=5.0.21
BUILDLINK_ABI_DEPENDS.db5+= db5>=5.3.15
BUILDLINK_PKGSRCDIR.db5?= ../../databases/db5
BUILDLINK_INCDIRS.db5?= include/db5
BUILDLINK_LDADD.db5= -ldb5
BUILDLINK_TRANSFORM+= l:db-5:db5
.include "../../mk/bsd.fast.prefs.mk"
.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS])
#BUILDLINK_LIBS.db5= ${BUILDLINK_LDADD.db5}
BUILDLINK_TRANSFORM+= l:db:db5
.endif
PTHREAD_OPTS+= native
.include "../../mk/pthread.buildlink3.mk"
.endif # DB5_BUILDLINK3_MK
BUILDLINK_TREE+= -db5

9
databases/db5/distinfo Normal file
View File

@@ -0,0 +1,9 @@
$NetBSD: distinfo,v 1.8 2012/05/31 09:37:20 adam Exp $
SHA1 (db-5.3.21.tar.gz) = 32e43c4898c8996750c958a90c174bd116fcba83
RMD160 (db-5.3.21.tar.gz) = 5768a4d835d02020165c6561cc5c406339662fa0
Size (db-5.3.21.tar.gz) = 35062469 bytes
SHA1 (patch-aa) = 9450e95f46787ddc1d661beaa239ea0ff4673f20
SHA1 (patch-ab) = 92cb9722e3bb6cdadbd7a542157b4fee69564d78
SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
SHA1 (patch-src_dbinc_atomic.h) = 6d1e97317c20021d13ff5b59f587730301b4a795

25
databases/db5/hacks.mk Normal file
View File

@@ -0,0 +1,25 @@
# $NetBSD: hacks.mk,v 1.1.1.1 2010/06/02 12:08:53 adam Exp $
### [Sun Mar 14 19:32:40 UTC 2004 : jlam]
### GCC 3.3.x and older versions have an optimization bug on powerpc that's
### tickled by the db5 source code, so remove optimization flags in that
### case. This fixes PR pkg/30647 by Ian Spray.
###
.if ${MACHINE_ARCH} == "powerpc"
. include "../../mk/compiler.mk"
. if !empty(CC_VERSION:Mgcc*)
. if !defined(_GCC_IS_TOO_OLD)
_GCC_IS_TOO_OLD!= \
if ${PKG_ADMIN} pmatch 'gcc<3.4' ${CC_VERSION}; then \
${ECHO} "yes"; \
else \
${ECHO} "no"; \
fi
MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q}
. endif
. if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS])
PKG_HACKS+= powerpc-codegen
BUILDLINK_TRANSFORM+= rm:-O[0-9]*
. endif
. endif
.endif

102
databases/db5/patches/patch-aa Normal file
View File

@@ -0,0 +1,102 @@
$NetBSD: patch-aa,v 1.4 2012/01/18 13:46:50 adam Exp $
--- dist/Makefile.in.orig 2011-12-20 01:00:49.000000000 +0000
+++ dist/Makefile.in
@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
bindir= @bindir@
includedir=@includedir@
libdir= @libdir@
-docdir= $(prefix)/docs
+docdir= $(prefix)/share/doc/db5
dmode= 755
emode= 555
@@ -54,7 +54,7 @@ INSTALLER= @INSTALLER@
LIBTOOL= @LIBTOOL@
POSTLINK= @POSTLINK@
-SOLINK= @MAKEFILE_SOLINK@ @CFLAGS@
+SOLINK= @MAKEFILE_SOLINK@ -version-info @DB_VERSION_MINOR@:@DB_VERSION_PATCH@ @CFLAGS@
SOFLAGS= @SOFLAGS@
LIBMAJOR= @DB_VERSION_MAJOR@
LIBVERSION= @DB_VERSION_MAJOR@.@DB_VERSION_MINOR@
@@ -73,7 +73,7 @@ LIBS= @LIBSO_LIBS@
TEST_LIBS= @TEST_LIBS@
LIBCSO_LIBS= @LIBCSO_LIBS@ @LIBSO_LIBS@
-libdb_base= libdb
+libdb_base= libdb5
libdb= $(libdb_base).a
libdb_version= $(libdb_base)-$(LIBVERSION).a
libso= $(libdb_base)-$(LIBVERSION)@SOSUFFIX@
@@ -92,7 +92,7 @@ CXXLINK= @MAKEFILE_CXXLINK@ @CXXFLAGS@
XSOLINK= @MAKEFILE_XSOLINK@ @CXXFLAGS@
LIBXSO_LIBS= @LIBXSO_LIBS@ @LIBSO_LIBS@
-libcxx_base= libdb_cxx
+libcxx_base= libdb5_cxx
libcxx= $(libcxx_base).a
libcxx_version= $(libcxx_base)-$(LIBVERSION).a
libxso= $(libcxx_base)-$(LIBVERSION)@SOSUFFIX@
@@ -157,9 +157,9 @@ JAVA_EXDIR= $(exampledir)/java/src
JAVA_SLEEPYCAT= $(langdir)/java/src/com/sleepycat
JAVA_MANIFEST= $(langdir)/java/jarManifestEntries
-libj_jarfile= db.jar
+libj_jarfile= db5.jar
libj_exjarfile= dbexamples.jar
-libjso_base= libdb_java
+libjso_base= libdb5_java
libjso= $(libjso_base)-$(LIBVERSION)@JMODSUFFIX@
libjso_static= $(libjso_base)-$(LIBVERSION).a
libjso_target= $(libjso_base)-$(LIBVERSION).la
@@ -175,7 +175,7 @@ libjso_g= $(libjso_base)-$(LIBVERSION)_g
TCL_INCLUDE_SPEC= @TCL_INCLUDE_SPEC@
LIBTSO_LIBS= @LIBTSO_LIBS@ @LIBSO_LIBS@
TCL_SRCDIR= $(langdir)/tcl
-libtcl_base= libdb_tcl
+libtcl_base= libdb5_tcl
libtcl= $(libtcl_base).a
libtcl_version= $(libtcl_base)-$(LIBVERSION).a
libtso= $(libtcl_base)-$(LIBVERSION)@LIBTSO_MODSUFFIX@
@@ -1093,8 +1093,7 @@ install_include: $(INCDOT)
@for f in $(INCDOT); do \
basef=`echo $$f | $(SED) 's,.*/,,'` ; \
$(RM) $(DESTDIR)$(includedir)/$$basef ; \
- $(CP) -p $$f $(DESTDIR)$(includedir) ; \
- $(CHMOD) $(fmode) $(DESTDIR)$(includedir)/$$basef ; \
+ $(BSD_INSTALL_DATA) $$f $(DESTDIR)$(includedir)/$$basef ; \
done
uninstall_include:
@@ -1109,7 +1108,7 @@ install_lib:
($(MKDIR) -p $(DESTDIR)$(libdir) && \
$(CHMOD) $(dmode) $(DESTDIR)$(libdir))
@cd $(DESTDIR)$(libdir) && $(RM) $(LIB_INSTALL_FILE_LIST)
- @$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
+ @libtool --mode=install $(BSD_INSTALL_LIB) @INSTALL_LIBS@ $(DESTDIR)$(libdir)
@(cd $(DESTDIR)$(libdir) && \
test -f $(libso) && $(LN) -s $(libso) $(libso_default); \
test -f $(libso) && $(LN) -s $(libso) $(libso_major); \
@@ -1140,10 +1139,8 @@ install_utilities:
@for i in $(UTIL_PROGS); do \
test -f $$i.exe && i=$$i.exe; \
e=`echo $$i | $(SED) '$(transform)'`; \
- $(RM) $(DESTDIR)$(bindir)/$$e; \
- $(INSTALLER) $$i $(DESTDIR)$(bindir)/$$e; \
- $(STRIP) $(DESTDIR)$(bindir)/$$e; \
- $(CHMOD) $(emode) $(DESTDIR)$(bindir)/$$e; \
+ target="${DESTDIR}${bindir}/$$e"; \
+ libtool --mode=install $(BSD_INSTALL_PROGRAM) $$i $$target; \
done
uninstall_utilities:
@@ -1165,7 +1162,7 @@ install_docs:
($(MKDIR) -p $(DESTDIR)$(docdir) && \
$(CHMOD) $(dmode) $(DESTDIR)$(docdir))
@cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST)
- @cd $(topdir)/docs && $(CP) -pr $(DOCLIST) $(DESTDIR)$(docdir)/
+ @cd $(topdir)/docs && pax -rwpp $(DOCLIST) $(DESTDIR)$(docdir)/
uninstall_docs:
@cd $(DESTDIR)$(docdir) && $(RM) -r $(DOCLIST)

49
databases/db5/patches/patch-ab Normal file
View File

@@ -0,0 +1,49 @@
$NetBSD: patch-ab,v 1.4 2012/01/18 13:46:50 adam Exp $
--- dist/configure.orig 2011-12-20 01:00:49.000000000 +0000
+++ dist/configure
@@ -5112,7 +5112,7 @@ bsdi3*) CC=${CC-"shlicc2"}
LIBSO_LIBS="$LIBSO_LIBS -lipc";;
cygwin*)
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";;
-freebsd*)
+freebsd*|dragonfly*)
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
LDFLAGS="$LDFLAGS -pthread";;
gnu*|k*bsd*-gnu|linux*)
@@ -6905,7 +6905,7 @@ fi
# we're using.
case "$host_os" in
sysv5UnixWare*|sysv5OpenUNIX8*)
- if test "$GCC" == "yes"; then
+ if test "$GCC" = "yes"; then
CPPFLAGS="$CPPFLAGS -pthread"
LDFLAGS="$LDFLAGS -pthread"
else
@@ -17712,7 +17712,7 @@ LIBTOOL="./libtool"
INSTALLER="\$(LIBTOOL) --mode=install cp -p"
MAKEFILE_CC="\$(LIBTOOL) --mode=compile ${MAKEFILE_CC}"
-MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK} -avoid-version"
+MAKEFILE_SOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
MAKEFILE_CCLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CCLINK}"
MAKEFILE_CXX="\$(LIBTOOL) --mode=compile ${MAKEFILE_CXX}"
MAKEFILE_XSOLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK} -avoid-version"
@@ -18445,7 +18445,7 @@ if test "$_JTOPDIR" != "/usr"; then
aix*) _JNI_INC_SUBDIRS="aix";;
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
cygwin*) _JNI_INC_SUBDIRS="win32";;
- freebsd*) _JNI_INC_SUBDIRS="freebsd";;
+ freebsd*|dragonfly*) _JNI_INC_SUBDIRS="freebsd";;
hp*) _JNI_INC_SUBDIRS="hp-ux";;
linux*) _JNI_INC_SUBDIRS="linux genunix";;
osf*) _JNI_INC_SUBDIRS="alpha";;
@@ -20565,7 +20565,7 @@ if test "$db_cv_mutex" = no; then
# avoid these probes for multiprocess pthreads.
;;
*)
- if test "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
+ if test "$ac_cv_lib_pthread_main" = yes -a "$db_cv_mutex" = no -o "$db_cv_mutex" = posix_only; then
LIBS="$LIBS -lpthread"
if test "$cross_compiling" = yes; then :

103
databases/db5/patches/patch-ac Normal file
View File

@@ -0,0 +1,103 @@
$NetBSD: patch-ac,v 1.2 2010/09/16 07:53:32 adam Exp $
--- src/hmac/sha1.c.orig 2008-03-12 23:44:14.000000000 +0100
+++ src/hmac/sha1.c
@@ -101,6 +101,64 @@ A million repetitions of "a"
w=rol(w,30);
#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+typedef union {
+ unsigned char c[64];
+ u_int32_t l[16];
+} CHAR64LONG16;
+
+#ifdef __sparc_v9__
+void do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+void do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+void do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+void do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *, int is_bigendian);
+
+#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
+#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
+#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
+#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
+#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
+
+void
+do_R01(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
+ nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
+ nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
+ nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
+ nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
+}
+
+void
+do_R2(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
+ nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
+ nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
+ nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
+ nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
+}
+
+void
+do_R3(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
+ nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
+ nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
+ nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
+ nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
+}
+
+void
+do_R4(u_int32_t *a, u_int32_t *b, u_int32_t *c, u_int32_t *d, u_int32_t *e, CHAR64LONG16 *block, int is_bigendian)
+{
+ nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
+ nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
+ nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
+ nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
+ nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
+}
+#endif
+
#ifdef VERBOSE /* SAK */
static void __db_SHAPrintContext __P((SHA1_CTX *, char *));
static void
@@ -132,10 +190,6 @@ __db_SHA1Transform(state, buffer)
unsigned char *buffer;
{
u_int32_t a, b, c, d, e;
-typedef union {
- unsigned char c[64];
- u_int32_t l[16];
-} CHAR64LONG16;
CHAR64LONG16* block;
int is_bigendian;
#ifdef SHA1HANDSOFF
@@ -154,6 +208,13 @@ CHAR64LONG16* block;
c = state[2];
d = state[3];
e = state[4];
+
+#ifdef __sparc_v9__
+ do_R01(&a, &b, &c, &d, &e, block, is_bigendian);
+ do_R2(&a, &b, &c, &d, &e, block, is_bigendian);
+ do_R3(&a, &b, &c, &d, &e, block, is_bigendian);
+ do_R4(&a, &b, &c, &d, &e, block, is_bigendian);
+#else
/* 4 rounds of 20 operations each. Loop unrolled. */
R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
@@ -175,6 +236,8 @@ CHAR64LONG16* block;
R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+#endif
+
/* Add the working vars back into context.state[] */
state[0] += a;
state[1] += b;

24
databases/db5/patches/patch-src_dbinc_atomic.h Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-src_dbinc_atomic.h,v 1.1 2012/05/31 09:37:21 adam Exp $
Avoid 'definition of builtin function' error.
--- src/dbinc/atomic.h.orig 2012-05-30 14:59:06.000000000 +0000
+++ src/dbinc/atomic.h
@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
#define atomic_inc(env, p) __atomic_inc(p)
#define atomic_dec(env, p) __atomic_dec(p)
#define atomic_compare_exchange(env, p, o, n) \
- __atomic_compare_exchange((p), (o), (n))
+ __atomic_compare_exchange_db((p), (o), (n))
static inline int __atomic_inc(db_atomic_t *p)
{
int temp;
@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic
* http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
* which configure could be changed to use.
*/
-static inline int __atomic_compare_exchange(
+static inline int __atomic_compare_exchange_db(
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
{
atomic_value_t was;