db5: Fix build issues found with clang/libc++

This is a genuine error that is discovered when using libc++ runtime

(From OE-Core rev: e4aa17ddc2ea623de2803efa9ab2fca498c99e19)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 148 insertions, 0 deletions

diff --git a/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch b/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch
new file mode 100644
index 0000000000..a4ff2ecb0c
--- /dev/null
+++ b/meta/recipes-support/db/db/0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch
@@ -0,0 +1,147 @@
+From a3569f118fd95b7ad41e1a1128e17c0b8928556d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 20 Jan 2019 18:30:23 -0800
+Subject: [PATCH] Fix libc++ compatibility by renaming atomic_init API
+
+db5 does not build because it is redefining a C++11 standard
+library identifier, atomic_init().  Therefore prefix all
+its internal defines with '__db_', to avoid collisions.
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/dbinc/atomic.h     | 4 ++--
+ src/mp/mp_fget.c       | 4 ++--
+ src/mp/mp_mvcc.c       | 4 ++--
+ src/mp/mp_region.c     | 4 ++--
+ src/mutex/mut_method.c | 2 +-
+ src/mutex/mut_tas.c    | 4 ++--
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h
+index 1b49de5..7bf353c 100644
+--- a/src/dbinc/atomic.h
++++ b/src/dbinc/atomic.h
+@@ -70,7 +70,7 @@ typedef struct {
+  * These have no memory barriers; the caller must include them when necessary.
+  */
+ #define        atomic_read(p)          ((p)->value)
+-#define        atomic_init(p, val)     ((p)->value = (val))
++#define        __db_atomic_init(p, val)        ((p)->value = (val))
+ 
+ #ifdef HAVE_ATOMIC_SUPPORT
+ 
+@@ -206,7 +206,7 @@ static inline int __db_atomic_compare_exchange(
+ #define        atomic_dec(env, p)      (--(p)->value)
+ #define        atomic_compare_exchange(env, p, oldval, newval)         \
+        (DB_ASSERT(env, atomic_read(p) == (oldval)),            \
+-       atomic_init(p, (newval)), 1)
++       __db_atomic_init(p, (newval)), 1)
+ #else
+ #define atomic_inc(env, p)     __atomic_inc(env, p)
+ #define atomic_dec(env, p)     __atomic_dec(env, p)
+diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c
+index 16de695..5159520 100644
+--- a/src/mp/mp_fget.c
++++ b/src/mp/mp_fget.c
+@@ -649,7 +649,7 @@ alloc:              /* Allocate a new buffer header and data space. */
+ 
+                /* Initialize enough so we can call __memp_bhfree. */
+                alloc_bhp->flags = 0;
+-               atomic_init(&alloc_bhp->ref, 1);
++               __db_atomic_init(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+                if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+                        __db_errx(env, DB_STR("3025",
+@@ -955,7 +955,7 @@ alloc:              /* Allocate a new buffer header and data space. */
+                        MVCC_MPROTECT(bhp->buf, mfp->pagesize,
+                            PROT_READ);
+ 
+-               atomic_init(&alloc_bhp->ref, 1);
++               __db_atomic_init(&alloc_bhp->ref, 1);
+                MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+                alloc_bhp->priority = bhp->priority;
+                alloc_bhp->pgno = bhp->pgno;
+diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c
+index 770bad8..dbce4f3 100644
+--- a/src/mp/mp_mvcc.c
++++ b/src/mp/mp_mvcc.c
+@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp)
+ #else
+        memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+-       atomic_init(&frozen_bhp->ref, 0);
++       __db_atomic_init(&frozen_bhp->ref, 0);
+        if (mutex != MUTEX_INVALID)
+                frozen_bhp->mtx_buf = mutex;
+        else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)
+ #endif
+                alloc_bhp->mtx_buf = mutex;
+                MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+-               atomic_init(&alloc_bhp->ref, 1);
++               __db_atomic_init(&alloc_bhp->ref, 1);
+                F_CLR(alloc_bhp, BH_FROZEN);
+        }
+ 
+diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c
+index 4952030..084f499 100644
+--- a/src/mp/mp_region.c
++++ b/src/mp/mp_region.c
+@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
+                             MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+                                return (ret);
+                        SH_TAILQ_INIT(&htab[i].hash_bucket);
+-                       atomic_init(&htab[i].hash_page_dirty, 0);
++                       __db_atomic_init(&htab[i].hash_page_dirty, 0);
+                }
+ 
+                /*
+@@ -302,7 +302,7 @@ no_prealloc:
+                } else
+                        hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount);
+                SH_TAILQ_INIT(&hp->hash_bucket);
+-               atomic_init(&hp->hash_page_dirty, 0);
++               __db_atomic_init(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+                hp->hash_io_wait = 0;
+                hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
+diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c
+index 09353b0..3c954b9 100644
+--- a/src/mutex/mut_method.c
++++ b/src/mutex/mut_method.c
+@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval)
+        MUTEX_LOCK(env, mtx);
+        ret = atomic_read(v) == oldval;
+        if (ret)
+-               atomic_init(v, newval);
++               __db_atomic_init(v, newval);
+        MUTEX_UNLOCK(env, mtx);
+ 
+        return (ret);
+diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c
+index 106b161..5a3b033 100644
+--- a/src/mutex/mut_tas.c
++++ b/src/mutex/mut_tas.c
+@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
+ 
+ #ifdef HAVE_SHARED_LATCHES
+        if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+-               atomic_init(&mutexp->sharecount, 0);
++               __db_atomic_init(&mutexp->sharecount, 0);
+        else
+ #endif
+        if (MUTEX_INIT(&mutexp->tas)) {
+@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex)
+                        F_CLR(mutexp, DB_MUTEX_LOCKED);
+                        /* Flush flag update before zeroing count */
+                        MEMBAR_EXIT();
+-                       atomic_init(&mutexp->sharecount, 0);
++                       __db_atomic_init(&mutexp->sharecount, 0);
+                } else {
+                        DB_ASSERT(env, sharecount > 0);
+                        MEMBAR_EXIT();
+-- 
+2.20.1
+
diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb
index b7ed2c798c..46536efe86 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/meta/recipes-support/db/db_5.3.28.bb
@@ -25,6 +25,7 @@ SRC_URI += "file://fix-parallel-build.patch \
             file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \
             file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \
             file://sequence-type.patch \
+            file://0001-Fix-libc-compatibility-by-renaming-atomic_init-API.patch \
            "
 # We are not interested in official latest 6.x versions;
 # let's track what debian is using.