diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2024-01-09 14:11:41 +0100 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2024-01-09 15:38:57 +0100 |
| commit | fa223ba5eb764fe822229a58d4d44d3ea83d0793 (patch) | |
| tree | c15fe6062679e60f631b60b3b53c101635d49c40 /src | |
| parent | fa7c751bd923cd9fb4790fe7fb51fafa2faa1db6 (diff) | |
| download | bitcoin-fa223ba5eb764fe822229a58d4d44d3ea83d0793.tar.xz | |
Revert "build: Fix undefined reference to __mulodi4"
This reverts commit e4c8bb62e4a6873c45f42d0d2a24927cb241a0ea.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.test.include | 2 | ||||
| -rw-r--r-- | src/test/fuzz/multiplication_overflow.cpp | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 416a11b0c0..870e49bd75 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -240,7 +240,7 @@ if ENABLE_FUZZ_BINARY test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS) test_fuzz_fuzz_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) test_fuzz_fuzz_LDADD = $(FUZZ_SUITE_LD_COMMON) -test_fuzz_fuzz_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) $(RUNTIME_LDFLAGS) +test_fuzz_fuzz_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) test_fuzz_fuzz_SOURCES = \ $(FUZZ_WALLET_SRC) \ test/fuzz/addition_overflow.cpp \ diff --git a/src/test/fuzz/multiplication_overflow.cpp b/src/test/fuzz/multiplication_overflow.cpp index fbe4d061bf..e45ed503f0 100644 --- a/src/test/fuzz/multiplication_overflow.cpp +++ b/src/test/fuzz/multiplication_overflow.cpp @@ -2,10 +2,6 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#if defined(HAVE_CONFIG_H) -#include <config/bitcoin-config.h> -#endif - #include <test/fuzz/FuzzedDataProvider.h> #include <test/fuzz/fuzz.h> #include <test/fuzz/util.h> @@ -14,6 +10,14 @@ #include <string> #include <vector> +#if defined(__has_builtin) +#if __has_builtin(__builtin_mul_overflow) +#define HAVE_BUILTIN_MUL_OVERFLOW +#endif +#elif defined(__GNUC__) +#define HAVE_BUILTIN_MUL_OVERFLOW +#endif + namespace { template <typename T> void TestMultiplicationOverflow(FuzzedDataProvider& fuzzed_data_provider) |