Skip to content

Commit 908c1d7

Browse files
committed
GCC-7 and glibc-2.27 compat code
1 parent e24bf1c commit 908c1d7

File tree

3 files changed

+49
-0
lines changed

3 files changed

+49
-0
lines changed

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,8 @@ if test x$use_glibc_compat != xno; then
595595
[ fdelt_type="long int"])
596596
AC_MSG_RESULT($fdelt_type)
597597
AC_DEFINE_UNQUOTED(FDELT_TYPE, $fdelt_type,[parameter and return value type for __fdelt_chk])
598+
AX_CHECK_LINK_FLAG([[-Wl,--wrap=__divmoddi4]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=__divmoddi4"])
599+
AX_CHECK_LINK_FLAG([[-Wl,--wrap=log2f]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=log2f"])
598600
else
599601
AC_SEARCH_LIBS([clock_gettime],[rt])
600602
fi
@@ -1284,6 +1286,7 @@ AC_SUBST(DEBUG_CPPFLAGS)
12841286
AC_SUBST(WARN_CXXFLAGS)
12851287
AC_SUBST(NOWARN_CXXFLAGS)
12861288
AC_SUBST(DEBUG_CXXFLAGS)
1289+
AC_SUBST(COMPAT_LDFLAGS)
12871290
AC_SUBST(ERROR_CXXFLAGS)
12881291
AC_SUBST(GPROF_CXXFLAGS)
12891292
AC_SUBST(GPROF_LDFLAGS)

src/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ libbitcoin_util_a_SOURCES = \
380380

381381
if GLIBC_BACK_COMPAT
382382
libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
383+
AM_LDFLAGS += $(COMPAT_LDFLAGS)
383384
endif
384385

385386
# cli: shared between bitcoin-cli and bitcoin-qt

src/compat/glibc_compat.cpp

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#endif
88

99
#include <cstddef>
10+
#include <cstdint>
1011

1112
#if defined(HAVE_SYS_SELECT_H)
1213
#include <sys/select.h>
@@ -27,3 +28,47 @@ extern "C" FDELT_TYPE __fdelt_warn(FDELT_TYPE a)
2728
return a / __NFDBITS;
2829
}
2930
extern "C" FDELT_TYPE __fdelt_chk(FDELT_TYPE) __attribute__((weak, alias("__fdelt_warn")));
31+
32+
#if defined(__i386__) || defined(__arm__)
33+
34+
extern "C" int64_t __udivmoddi4(uint64_t u, uint64_t v, uint64_t* rp);
35+
36+
extern "C" int64_t __wrap___divmoddi4(int64_t u, int64_t v, int64_t* rp)
37+
{
38+
int32_t c1 = 0, c2 = 0;
39+
int64_t uu = u, vv = v;
40+
int64_t w;
41+
int64_t r;
42+
43+
if (uu < 0) {
44+
c1 = ~c1, c2 = ~c2, uu = -uu;
45+
}
46+
if (vv < 0) {
47+
c1 = ~c1, vv = -vv;
48+
}
49+
50+
w = __udivmoddi4(uu, vv, (uint64_t*)&r);
51+
if (c1)
52+
w = -w;
53+
if (c2)
54+
r = -r;
55+
56+
*rp = r;
57+
return w;
58+
}
59+
#endif
60+
61+
extern "C" float log2f_old(float x);
62+
#ifdef __i386__
63+
__asm(".symver log2f_old,log2f@GLIBC_2.1");
64+
#elif defined(__amd64__)
65+
__asm(".symver log2f_old,log2f@GLIBC_2.2.5");
66+
#elif defined(__arm__)
67+
__asm(".symver log2f_old,log2f@GLIBC_2.4");
68+
#elif defined(__aarch64__)
69+
__asm(".symver log2f_old,log2f@GLIBC_2.17");
70+
#endif
71+
extern "C" float __wrap_log2f(float x)
72+
{
73+
return log2f_old(x);
74+
}

0 commit comments

Comments
 (0)