Update gitian build, glibc back compat, cleanup

CryptAxe · CryptAxe · commit 240b580985e5 · 2019-06-09T22:50:24.000-07:00
Implemented a version of these pull requests from upstream: bitcoin/bitcoin#13177 bitcoin/bitcoin#13171
diff --git a/configure.ac b/configure.ac
@@ -549,6 +549,8 @@ if test x$use_glibc_compat != xno; then
     [ fdelt_type="long int"])
   AC_MSG_RESULT($fdelt_type)
   AC_DEFINE_UNQUOTED(FDELT_TYPE, $fdelt_type,[parameter and return value type for __fdelt_chk])
+  AX_CHECK_LINK_FLAG([[-Wl,--wrap=__divmoddi4]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=__divmoddi4"])
+  AX_CHECK_LINK_FLAG([[-Wl,--wrap=log2f]], [COMPAT_LDFLAGS="$COMPAT_LDFLAGS -Wl,--wrap=log2f"])
 else
   AC_SEARCH_LIBS([clock_gettime],[rt])
 fi
@@ -1236,6 +1238,7 @@ AC_SUBST(DRIVENET_CLI_NAME)
 AC_SUBST(DRIVENET_TX_NAME)
 
 AC_SUBST(RELDFLAGS)
+AC_SUBST(COMPAT_LDFLAGS)
 AC_SUBST(ERROR_CXXFLAGS)
 AC_SUBST(HARDENED_CXXFLAGS)
 AC_SUBST(HARDENED_CPPFLAGS)
diff --git a/contrib/devtools/symbol-check.py b/contrib/devtools/symbol-check.py
@@ -47,7 +47,7 @@
 
 # Ignore symbols that are exported as part of every executable
 IGNORE_EXPORTS = {
-b'_edata', b'_end', b'_init', b'__bss_start', b'_fini', b'_IO_stdin_used'
+b'_edata', b'_end', b'_init', b'__bss_start', b'_fini', b'_IO_stdin_used', 'stdin', 'stdout', 'stderr'
 }
 READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')
 CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')
diff --git a/contrib/gitian-build.sh b/contrib/gitian-build.sh
@@ -236,9 +236,9 @@ then
     if [[ -n "$USE_LXC" ]]
     then
         sudo apt-get install lxc
-        bin/make-base-vm --suite trusty --arch amd64 --lxc
+        bin/make-base-vm --suite bionic --arch amd64 --lxc
     else
-        bin/make-base-vm --suite trusty --arch amd64
+        bin/make-base-vm --suite bionic --arch amd64
     fi
     popd
 fi
@@ -254,12 +254,12 @@ if [[ $build = true ]]
 then
 	# Make output folder
 	mkdir -p ./bitcoin-binaries/${VERSION}
-	
+
 	# Build Dependencies
 	echo ""
 	echo "Building Dependencies"
 	echo ""
-	pushd ./gitian-builder	
+	pushd ./gitian-builder
 	mkdir -p inputs
 	wget -N -P inputs $osslPatchUrl
 	wget -N -P inputs $osslTarUrl
@@ -328,10 +328,10 @@ then
 	echo "Verifying v${VERSION} Windows"
 	echo ""
 	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-win-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
-	# Mac OSX	
+	# Mac OSX
 	echo ""
 	echo "Verifying v${VERSION} Mac OSX"
-	echo ""	
+	echo ""
 	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-unsigned ../bitcoin/contrib/gitian-descriptors/gitian-osx.yml
 	# Signed Windows
 	echo ""
@@ -342,14 +342,14 @@ then
 	echo ""
 	echo "Verifying v${VERSION} Signed Mac OSX"
 	echo ""
-	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml	
+	./bin/gverify -v -d ../gitian.sigs/ -r ${VERSION}-osx-signed ../bitcoin/contrib/gitian-descriptors/gitian-osx-signer.yml
 	popd
 fi
 
 # Sign binaries
 if [[ $sign = true ]]
 then
-	
+
         pushd ./gitian-builder
 	# Sign Windows
 	if [[ $windows = true ]]
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
@@ -2,23 +2,23 @@
 name: "DriveNet-linux-0.21"
 enable_cache: true
 suites:
-- "trusty"
+- "bionic"
 architectures:
 - "amd64"
 packages:
 - "curl"
 - "g++-aarch64-linux-gnu"
-- "g++-4.8-aarch64-linux-gnu"
-- "gcc-4.8-aarch64-linux-gnu"
+- "g++-8-aarch64-linux-gnu"
+- "gcc-8-aarch64-linux-gnu"
 - "binutils-aarch64-linux-gnu"
 - "g++-arm-linux-gnueabihf"
-- "g++-4.8-arm-linux-gnueabihf"
-- "gcc-4.8-arm-linux-gnueabihf"
+- "g++-8-arm-linux-gnueabihf"
+- "gcc-8-arm-linux-gnueabihf"
 - "binutils-arm-linux-gnueabihf"
-- "g++-4.8-multilib"
-- "gcc-4.8-multilib"
+- "g++-8-multilib"
+- "gcc-8-multilib"
 - "binutils-gold"
-- "git-core"
+- "git"
 - "pkg-config"
 - "autoconf"
 - "libtool"
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -371,6 +371,7 @@ libdrivenet_util_a_SOURCES = \
 
 if GLIBC_BACK_COMPAT
 libdrivenet_util_a_SOURCES += compat/glibc_compat.cpp
+AM_LDFLAGS += $(COMPAT_LDFLAGS)
 endif
 
 # cli: shared between drivenet-cli and drivenet-qt
diff --git a/src/compat/glibc_compat.cpp b/src/compat/glibc_compat.cpp
@@ -7,6 +7,7 @@
 #endif
 
 #include <cstddef>
+#include <cstdint>
 
 #if defined(HAVE_SYS_SELECT_H)
 #include <sys/select.h>
@@ -27,3 +28,47 @@ extern "C" FDELT_TYPE __fdelt_warn(FDELT_TYPE a)
     return a / __NFDBITS;
 }
 extern "C" FDELT_TYPE __fdelt_chk(FDELT_TYPE) __attribute__((weak, alias("__fdelt_warn")));
+
+#if defined(__i386__) || defined(__arm__)
+
+extern "C" int64_t __udivmoddi4(uint64_t u, uint64_t v, uint64_t* rp);
+
+extern "C" int64_t __wrap___divmoddi4(int64_t u, int64_t v, int64_t* rp)
+{
+    int32_t c1 = 0, c2 = 0;
+    int64_t uu = u, vv = v;
+    int64_t w;
+    int64_t r;
+
+    if (uu < 0) {
+        c1 = ~c1, c2 = ~c2, uu = -uu;
+    }
+    if (vv < 0) {
+        c1 = ~c1, vv = -vv;
+    }
+
+    w = __udivmoddi4(uu, vv, (uint64_t*)&r);
+    if (c1)
+        w = -w;
+    if (c2)
+        r = -r;
+
+    *rp = r;
+    return w;
+}
+#endif
+
+extern "C" float log2f_old(float x);
+#ifdef __i386__
+__asm(".symver log2f_old,log2f@GLIBC_2.1");
+#elif defined(__amd64__)
+__asm(".symver log2f_old,log2f@GLIBC_2.2.5");
+#elif defined(__arm__)
+__asm(".symver log2f_old,log2f@GLIBC_2.4");
+#elif defined(__aarch64__)
+__asm(".symver log2f_old,log2f@GLIBC_2.17");
+#endif
+extern "C" float __wrap_log2f(float x)
+{
+    return log2f_old(x);
+}
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -5263,9 +5263,6 @@ bool LoadDepositCache()
         return false;
     }
 
-    // TODO log this
-    uint64_t fileSize = fs::file_size(path);
-
     std::vector<SidechainDeposit> vDeposit;
     try {
         int nVersionRequired, nVersionThatWrote;
@@ -5341,9 +5338,6 @@ bool LoadWTPrimeCache()
         return false;
     }
 
-    // TODO log this
-    uint64_t fileSize = fs::file_size(path);
-
     std::vector<CTransactionRef> vWTPrime;
     try {
         int nVersionRequired, nVersionThatWrote;
@@ -5412,9 +5406,6 @@ bool LoadSidechainActivationStatusCache()
         return false;
     }
 
-    // TODO log this
-    uint64_t fileSize = fs::file_size(path);
-
     std::vector<SidechainActivationStatus> vActivationStatus;
     try {
         int nVersionRequired, nVersionThatWrote;
@@ -5480,9 +5471,6 @@ bool LoadActiveSidechainCache()
         return false;
     }
 
-    // TODO log this
-    uint64_t fileSize = fs::file_size(path);
-
     std::vector<Sidechain> vSidechain;
     try {
         int nVersionRequired, nVersionThatWrote;
@@ -5547,9 +5535,6 @@ bool LoadSidechainProposalCache()
         return false;
     }
 
-    // TODO log this
-    uint64_t fileSize = fs::file_size(path);
-
     std::vector<SidechainProposal> vProposal;
     try {
         int nVersionRequired, nVersionThatWrote;
@@ -5614,9 +5599,6 @@ bool LoadSidechainActivationHashCache()
         return false;
     }
 
-    // TODO log this
-    uint64_t fileSize = fs::file_size(path);
-
     std::vector<uint256> vHash;
     try {
         int nVersionRequired, nVersionThatWrote;
@@ -5635,7 +5617,6 @@ bool LoadSidechainActivationHashCache()
         }
     }
     catch (const std::exception& e) {
-        // TODO log this
         LogPrintf("%s: Exception: %s\n", __func__, e.what());
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`
`48`	`48`	`# Ignore symbols that are exported as part of every executable`
`49`	`49`	`IGNORE_EXPORTS = {`
`50`		`-b'_edata', b'_end', b'_init', b'__bss_start', b'_fini', b'_IO_stdin_used'`
	`50`	`+b'_edata', b'_end', b'_init', b'__bss_start', b'_fini', b'_IO_stdin_used', 'stdin', 'stdout', 'stderr'`
`51`	`51`	`}`
`52`	`52`	`READELF_CMD = os.getenv('READELF', '/usr/bin/readelf')`
`53`	`53`	`CPPFILT_CMD = os.getenv('CPPFILT', '/usr/bin/c++filt')`