sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #20358: src/randomenv.cpp: fix build on uclibc

Browse Source 
330cb33985d0ce97c20f4a0f0bbda0fbffe098d4 src/randomenv.cpp: fix build on uclibc (Fabrice Fontaine)

Pull request description:

  Check for HAVE_STRONG_GETAUXVAL or HAVE_WEAK_GETAUXVAL before using
  getauxval to avoid a build failure on uclibc

  Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

ACKs for top commit:
  laanwj:
    Code review ACK 330cb33985d0ce97c20f4a0f0bbda0fbffe098d4

Tree-SHA512: 94fbbdb0e859f0220d64b2d04565f575b410327f080125fec7fb74205d0bea0e8133561c83a696033d6dc377871133871b72c1aad19aca61e972ce67e0fdf707
This commit is contained in:
Wladimir J. van der Laan 2020-11-19 11:55:35 +01:00 committed by pasta
parent 0f79a4002b
commit a193964e0e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/randomenv.cpp
View File

@ -53,7 +53,7 @@
#include <sys/vmmeter.h> #include <sys/vmmeter.h>
#endif #endif
#endif #endif
#ifdef __linux__ #if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL)
#include <sys/auxv.h> #include <sys/auxv.h>
#endif #endif
@ -326,7 +326,7 @@ void RandAddStaticEnv(CSHA512& hasher)
// Bitcoin client version // Bitcoin client version
hasher << CLIENT_VERSION; hasher << CLIENT_VERSION;
#ifdef __linux__ #if defined(HAVE_STRONG_GETAUXVAL) || defined(HAVE_WEAK_GETAUXVAL)
// Information available through getauxval() // Information available through getauxval()
# ifdef AT_HWCAP # ifdef AT_HWCAP
hasher << getauxval(AT_HWCAP); hasher << getauxval(AT_HWCAP);
@ -346,7 +346,7 @@ void RandAddStaticEnv(CSHA512& hasher)
const char* exec_str = (const char*)getauxval(AT_EXECFN); const char* exec_str = (const char*)getauxval(AT_EXECFN);
if (exec_str) hasher.Write((const unsigned char*)exec_str, strlen(exec_str) + 1); if (exec_str) hasher.Write((const unsigned char*)exec_str, strlen(exec_str) + 1);
# endif # endif
#endif // __linux__ #endif // HAVE_STRONG_GETAUXVAL || HAVE_WEAK_GETAUXVAL
#ifdef HAVE_GETCPUID #ifdef HAVE_GETCPUID
AddAllCPUID(hasher); AddAllCPUID(hasher);