Skip to content

Commit 2a5ec71

Browse files
jamescowensjamescowens
authored
Merge pull request #2353 from jamescowens/update_leveldb_to_1.22
build, util: Update leveldb to 1.22 from upstream Bitcoin
2 parents ce0176e + a29a7a0 commit 2a5ec71

File tree

200 files changed

+11525
-7900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+11525
-7900
lines changed

‎Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ $(BITCOIND_BIN): FORCE
162162
$(MAKE) -C src $(@F)
163163

164164
if USE_LCOV
165-
LCOV_FILTER_PATTERN=-p "/usr/include/" -p "src/leveldb/" -p "src/univalue"
165+
LCOV_FILTER_PATTERN=-p "/usr/include/" -p "src/leveldb/" -p "src/crc32c/" -p "src/univalue"
166166

167167
baseline.info:
168168
$(LCOV) -c -i -d $(abs_builddir)/src -o $@

‎configure.ac

Lines changed: 75 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ case $host in
440440
fi
441441

442442
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601"
443-
LEVELDB_TARGET_FLAGS="-DOS_WINDOWS"
444443
case $host in
445444
i?86-*) WINDOWS_BITS=32 ;;
446445
x86_64-*) WINDOWS_BITS=64 ;;
@@ -461,7 +460,6 @@ case $host in
461460
;;
462461
*darwin*)
463462
TARGET_OS=darwin
464-
LEVELDB_TARGET_FLAGS="-DOS_MACOSX"
465463
if test x$cross_compiling != xyes; then
466464
BUILD_OS=darwin
467465
AC_CHECK_PROG([PORT],port, port)
@@ -533,19 +531,15 @@ case $host in
533531
;;
534532
*linux*)
535533
TARGET_OS=linux
536-
LEVELDB_TARGET_FLAGS="-DOS_LINUX"
537534
LIBS="$LIBS -lrt"
538535
;;
539536
*freebsd*)
540-
LEVELDB_TARGET_FLAGS="-DOS_FREEBSD"
541537
;;
542538
*openbsd*)
543-
LEVELDB_TARGET_FLAGS="-DOS_OPENBSD"
544539
;;
545540
*)
546541
OTHER_OS=`echo ${host_os} | awk '{print toupper($0)}'`
547542
AC_MSG_WARN([Guessing LevelDB OS as OS_${OTHER_OS}, please check whether this is correct, if not add an entry to configure.ac.])
548-
LEVELDB_TARGET_FLAGS="-DOS_${OTHER_OS}"
549543
;;
550544
esac
551545

@@ -842,6 +836,72 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
842836
[ AC_MSG_RESULT(no)]
843837
)
844838

839+
# LevelDB platform checks
840+
AC_MSG_CHECKING(for fdatasync)
841+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],
842+
[[ fdatasync(0); ]])],
843+
[ AC_MSG_RESULT(yes); HAVE_FDATASYNC=1 ],
844+
[ AC_MSG_RESULT(no); HAVE_FDATASYNC=0 ]
845+
)
846+
847+
AC_MSG_CHECKING(for F_FULLFSYNC)
848+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>]],
849+
[[ fcntl(0, F_FULLFSYNC, 0); ]])],
850+
[ AC_MSG_RESULT(yes); HAVE_FULLFSYNC=1 ],
851+
[ AC_MSG_RESULT(no); HAVE_FULLFSYNC=0 ]
852+
)
853+
854+
AC_MSG_CHECKING(for O_CLOEXEC)
855+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>]],
856+
[[ open("", O_CLOEXEC); ]])],
857+
[ AC_MSG_RESULT(yes); HAVE_O_CLOEXEC=1 ],
858+
[ AC_MSG_RESULT(no); HAVE_O_CLOEXEC=0 ]
859+
)
860+
861+
# crc32c platform checks
862+
AC_MSG_CHECKING(for __builtin_prefetch)
863+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ]], [[
864+
char data = 0;
865+
const char* address = &data;
866+
__builtin_prefetch(address, 0, 0);
867+
]])],
868+
[ AC_MSG_RESULT(yes); HAVE_BUILTIN_PREFETCH=1 ],
869+
[ AC_MSG_RESULT(no); HAVE_BUILTIN_PREFETCH=0 ]
870+
)
871+
872+
AC_MSG_CHECKING(for _mm_prefetch)
873+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <xmmintrin.h>]], [[
874+
char data = 0;
875+
const char* address = &data;
876+
_mm_prefetch(address, _MM_HINT_NTA);
877+
]])],
878+
[ AC_MSG_RESULT(yes); HAVE_MM_PREFETCH=1 ],
879+
[ AC_MSG_RESULT(no); HAVE_MM_PREFETCH=0 ]
880+
)
881+
882+
AC_MSG_CHECKING(for strong getauxval support in the system headers)
883+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
884+
#include <arm_acle.h>
885+
#include <arm_neon.h>
886+
#include <sys/auxv.h>
887+
]], [[
888+
getauxval(AT_HWCAP);
889+
]])],
890+
[ AC_MSG_RESULT(yes); HAVE_STRONG_GETAUXVAL=1 ],
891+
[ AC_MSG_RESULT(no); HAVE_STRONG_GETAUXVAL=0 ]
892+
)
893+
894+
AC_MSG_CHECKING(for weak getauxval support in the compiler)
895+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
896+
unsigned long getauxval(unsigned long type) __attribute__((weak));
897+
#define AT_HWCAP 16
898+
]], [[
899+
getauxval(AT_HWCAP);
900+
]])],
901+
[ AC_MSG_RESULT(yes); HAVE_WEAK_GETAUXVAL=1 ],
902+
[ AC_MSG_RESULT(no); HAVE_WEAK_GETAUXVAL=0 ]
903+
)
904+
845905
# Check for reduced exports
846906
if test x$use_reduce_exports = xyes; then
847907
AX_CHECK_COMPILE_FLAG([-fvisibility=hidden],[RE_CXXFLAGS="-fvisibility=hidden"],
@@ -1135,6 +1195,7 @@ AM_CONDITIONAL([ENABLE_AVX2],[test x$enable_avx2 = xyes])
11351195
AM_CONDITIONAL([ENABLE_SHANI],[test x$enable_shani = xyes])
11361196
AM_CONDITIONAL([ENABLE_ARM_CRC],[test x$enable_arm_crc = xyes])
11371197
AM_CONDITIONAL([USE_ASM],[test x$use_asm = xyes])
1198+
AM_CONDITIONAL([WORDS_BIGENDIAN],[test x$ac_cv_c_bigendian = xyes])
11381199
AM_CONDITIONAL([ARCH_x86], [test x$have_x86 = xtrue])
11391200
AM_CONDITIONAL([ARCH_x86_64], [test x$have_x86_64 = xtrue])
11401201
AM_CONDITIONAL([ARCH_ARM], [test x$have_arm = xtrue])
@@ -1172,12 +1233,12 @@ AC_SUBST(SSE42_CXXFLAGS)
11721233
AC_SUBST(SSE41_CXXFLAGS)
11731234
AC_SUBST(AVX2_CXXFLAGS)
11741235
AC_SUBST(SHANI_CXXFLAGS)
1236+
AC_SUBST(ARM_CRC_CXXFLAGS)
11751237
AC_SUBST(LIBTOOL_APP_LDFLAGS)
11761238
AC_SUBST(USE_UPNP)
11771239
AC_SUBST(USE_QRCODE)
11781240
AC_SUBST(BOOST_LIBS)
11791241
AC_SUBST(TESTDEFS)
1180-
AC_SUBST(LEVELDB_TARGET_FLAGS)
11811242
AC_SUBST(MINIUPNPC_CPPFLAGS)
11821243
AC_SUBST(MINIUPNPC_LIBS)
11831244
AC_SUBST(CRYPTO_LIBS)
@@ -1189,6 +1250,13 @@ AC_SUBST(EVENT_PTHREADS_LIBS)
11891250
AC_SUBST(ZMQ_LIBS)
11901251
AC_SUBST(PROTOBUF_LIBS)
11911252
AC_SUBST(QR_LIBS)
1253+
AC_SUBST(HAVE_FDATASYNC)
1254+
AC_SUBST(HAVE_FULLFSYNC)
1255+
AC_SUBST(HAVE_O_CLOEXEC)
1256+
AC_SUBST(HAVE_BUILTIN_PREFETCH)
1257+
AC_SUBST(HAVE_MM_PREFETCH)
1258+
AC_SUBST(HAVE_STRONG_GETAUXVAL)
1259+
AC_SUBST(HAVE_WEAK_GETAUXVAL)
11921260
AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist])
11931261
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
11941262
AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([doc/Doxyfile])])

‎src/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ clean-local:
413413
$(AM_V_GEN) $(PROTOC) --cpp_out=$(@D) --proto_path=$(<D) $<
414414

415415
if EMBEDDED_LEVELDB
416+
include Makefile.crc32c.include
416417
include Makefile.leveldb.include
417418
endif
418419

‎src/Makefile.crc32c.include

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# Copyright (c) 2019 The Bitcoin Core developers
2+
# Distributed under the MIT software license, see the accompanying
3+
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
LIBCRC32C_INT = crc32c/libcrc32c.a
6+
LIBLEVELDB_SSE42_INT = leveldb/libleveldb_sse42.a
7+
8+
EXTRA_LIBRARIES += $(LIBCRC32C_INT)
9+
10+
LIBCRC32C = $(LIBCRC32C_INT)
11+
12+
CRC32C_CPPFLAGS_INT =
13+
CRC32C_CPPFLAGS_INT += -I$(srcdir)/crc32c/include
14+
CRC32C_CPPFLAGS_INT += -DHAVE_BUILTIN_PREFETCH=@HAVE_BUILTIN_PREFETCH@
15+
CRC32C_CPPFLAGS_INT += -DHAVE_MM_PREFETCH=@HAVE_MM_PREFETCH@
16+
CRC32C_CPPFLAGS_INT += -DHAVE_STRONG_GETAUXVAL=@HAVE_STRONG_GETAUXVAL@
17+
CRC32C_CPPFLAGS_INT += -DHAVE_WEAK_GETAUXVAL=@HAVE_WEAK_GETAUXVAL@
18+
CRC32C_CPPFLAGS_INT += -DCRC32C_TESTS_BUILT_WITH_GLOG=0
19+
20+
if ENABLE_SSE42
21+
CRC32C_CPPFLAGS_INT += -DHAVE_SSE42=1
22+
else
23+
CRC32C_CPPFLAGS_INT += -DHAVE_SSE42=0
24+
endif
25+
26+
if ENABLE_ARM_CRC
27+
CRC32C_CPPFLAGS_INT += -DHAVE_ARM64_CRC32C=1
28+
else
29+
CRC32C_CPPFLAGS_INT += -DHAVE_ARM64_CRC32C=0
30+
endif
31+
32+
if WORDS_BIGENDIAN
33+
CRC32C_CPPFLAGS_INT += -DBYTE_ORDER_BIG_ENDIAN=1
34+
else
35+
CRC32C_CPPFLAGS_INT += -DBYTE_ORDER_BIG_ENDIAN=0
36+
endif
37+
38+
crc32c_libcrc32c_a_CPPFLAGS = $(AM_CPPFLAGS) $(CRC32C_CPPFLAGS_INT) $(CRC32C_CPPFLAGS)
39+
crc32c_libcrc32c_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
40+
41+
crc32c_libcrc32c_a_SOURCES =
42+
crc32c_libcrc32c_a_SOURCES += crc32c/include/crc32c/crc32c.h
43+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_arm64.h
44+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_arm64_check.h
45+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_internal.h
46+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_prefetch.h
47+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_read_le.h
48+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_round_up.h
49+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_sse42_check.h
50+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_sse42.h
51+
52+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c.cc
53+
crc32c_libcrc32c_a_SOURCES += crc32c/src/crc32c_portable.cc
54+
55+
if ENABLE_SSE42
56+
LIBCRC32C_SSE42_INT = crc32c/libcrc32c_sse42.a
57+
EXTRA_LIBRARIES += $(LIBCRC32C_SSE42_INT)
58+
LIBCRC32C += $(LIBCRC32C_SSE42_INT)
59+
60+
crc32c_libcrc32c_sse42_a_CPPFLAGS = $(crc32c_libcrc32c_a_CPPFLAGS)
61+
crc32c_libcrc32c_sse42_a_CXXFLAGS = $(crc32c_libcrc32c_a_CXXFLAGS) $(SSE42_CXXFLAGS)
62+
63+
crc32c_libcrc32c_sse42_a_SOURCES = crc32c/src/crc32c_sse42.cc
64+
endif
65+
66+
if ENABLE_ARM_CRC
67+
LIBCRC32C_ARM_CRC_INT = crc32c/libcrc32c_arm_crc.a
68+
EXTRA_LIBRARIES += $(LIBCRC32C_ARM_CRC_INT)
69+
LIBCRC32C += $(LIBCRC32C_ARM_CRC_INT)
70+
71+
crc32c_libcrc32c_arm_crc_a_CPPFLAGS = $(crc32c_libcrc32c_a_CPPFLAGS)
72+
crc32c_libcrc32c_arm_crc_a_CXXFLAGS = $(crc32c_libcrc32c_a_CXXFLAGS) $(ARM_CRC_CXXFLAGS)
73+
74+
crc32c_libcrc32c_arm_crc_a_SOURCES = crc32c/src/crc32c_arm64.cc
75+
endif

‎src/Makefile.leveldb.include

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,33 @@
44

55
LIBLEVELDB_INT = leveldb/libleveldb.a
66
LIBMEMENV_INT = leveldb/libmemenv.a
7-
LIBLEVELDB_SSE42_INT = leveldb/libleveldb_sse42.a
87

98
EXTRA_LIBRARIES += $(LIBLEVELDB_INT)
109
EXTRA_LIBRARIES += $(LIBMEMENV_INT)
11-
EXTRA_LIBRARIES += $(LIBLEVELDB_SSE42_INT)
1210

13-
LIBLEVELDB += $(LIBLEVELDB_INT)
11+
LIBLEVELDB += $(LIBLEVELDB_INT) $(LIBCRC32C)
1412
LIBMEMENV += $(LIBMEMENV_INT)
15-
LIBLEVELDB_SSE42 = $(LIBLEVELDB_SSE42_INT)
1613

1714
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
1815
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
1916

2017
LEVELDB_CPPFLAGS_INT =
2118
LEVELDB_CPPFLAGS_INT += -I$(srcdir)/leveldb
22-
LEVELDB_CPPFLAGS_INT += $(LEVELDB_TARGET_FLAGS)
23-
LEVELDB_CPPFLAGS_INT += -DLEVELDB_ATOMIC_PRESENT
19+
LEVELDB_CPPFLAGS_INT += -I$(srcdir)/crc32c/include
2420
LEVELDB_CPPFLAGS_INT += -D__STDC_LIMIT_MACROS
21+
LEVELDB_CPPFLAGS_INT += -DHAVE_SNAPPY=0 -DHAVE_CRC32C=1
22+
LEVELDB_CPPFLAGS_INT += -DHAVE_FDATASYNC=@HAVE_FDATASYNC@
23+
LEVELDB_CPPFLAGS_INT += -DHAVE_FULLFSYNC=@HAVE_FULLFSYNC@
24+
LEVELDB_CPPFLAGS_INT += -DHAVE_O_CLOEXEC=@HAVE_O_CLOEXEC@
25+
26+
if WORDS_BIGENDIAN
27+
LEVELDB_CPPFLAGS_INT += -DLEVELDB_IS_BIG_ENDIAN=1
28+
else
29+
LEVELDB_CPPFLAGS_INT += -DLEVELDB_IS_BIG_ENDIAN=0
30+
endif
2531

2632
if TARGET_WINDOWS
27-
LEVELDB_CPPFLAGS_INT += -DLEVELDB_PLATFORM_WINDOWS -D__USE_MINGW_ANSI_STDIO=1
33+
LEVELDB_CPPFLAGS_INT += -DLEVELDB_PLATFORM_WINDOWS -D_UNICODE -DUNICODE -D__USE_MINGW_ANSI_STDIO=1
2834
else
2935
LEVELDB_CPPFLAGS_INT += -DLEVELDB_PLATFORM_POSIX
3036
endif
@@ -33,12 +39,8 @@ leveldb_libleveldb_a_CPPFLAGS = $(AM_CPPFLAGS) $(LEVELDB_CPPFLAGS_INT) $(LEVELDB
3339
leveldb_libleveldb_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
3440

3541
leveldb_libleveldb_a_SOURCES=
36-
leveldb_libleveldb_a_SOURCES += leveldb/port/atomic_pointer.h
37-
leveldb_libleveldb_a_SOURCES += leveldb/port/port_example.h
38-
leveldb_libleveldb_a_SOURCES += leveldb/port/port_posix.h
39-
leveldb_libleveldb_a_SOURCES += leveldb/port/win/stdint.h
42+
leveldb_libleveldb_a_SOURCES += leveldb/port/port_stdcxx.h
4043
leveldb_libleveldb_a_SOURCES += leveldb/port/port.h
41-
leveldb_libleveldb_a_SOURCES += leveldb/port/port_win.h
4244
leveldb_libleveldb_a_SOURCES += leveldb/port/thread_annotations.h
4345
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/db.h
4446
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/options.h
@@ -47,6 +49,7 @@ leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/filter_policy.h
4749
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/slice.h
4850
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/table_builder.h
4951
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/env.h
52+
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/export.h
5053
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/c.h
5154
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/iterator.h
5255
leveldb_libleveldb_a_SOURCES += leveldb/include/leveldb/cache.h
@@ -78,6 +81,7 @@ leveldb_libleveldb_a_SOURCES += leveldb/table/format.h
7881
leveldb_libleveldb_a_SOURCES += leveldb/table/iterator_wrapper.h
7982
leveldb_libleveldb_a_SOURCES += leveldb/util/crc32c.h
8083
leveldb_libleveldb_a_SOURCES += leveldb/util/env_posix_test_helper.h
84+
leveldb_libleveldb_a_SOURCES += leveldb/util/env_windows_test_helper.h
8185
leveldb_libleveldb_a_SOURCES += leveldb/util/arena.h
8286
leveldb_libleveldb_a_SOURCES += leveldb/util/random.h
8387
leveldb_libleveldb_a_SOURCES += leveldb/util/posix_logger.h
@@ -87,7 +91,9 @@ leveldb_libleveldb_a_SOURCES += leveldb/util/coding.h
8791
leveldb_libleveldb_a_SOURCES += leveldb/util/testutil.h
8892
leveldb_libleveldb_a_SOURCES += leveldb/util/mutexlock.h
8993
leveldb_libleveldb_a_SOURCES += leveldb/util/logging.h
94+
leveldb_libleveldb_a_SOURCES += leveldb/util/no_destructor.h
9095
leveldb_libleveldb_a_SOURCES += leveldb/util/testharness.h
96+
leveldb_libleveldb_a_SOURCES += leveldb/util/windows_logger.h
9197

9298
leveldb_libleveldb_a_SOURCES += leveldb/db/builder.cc
9399
leveldb_libleveldb_a_SOURCES += leveldb/db/c.cc
@@ -120,7 +126,6 @@ leveldb_libleveldb_a_SOURCES += leveldb/util/coding.cc
120126
leveldb_libleveldb_a_SOURCES += leveldb/util/comparator.cc
121127
leveldb_libleveldb_a_SOURCES += leveldb/util/crc32c.cc
122128
leveldb_libleveldb_a_SOURCES += leveldb/util/env.cc
123-
leveldb_libleveldb_a_SOURCES += leveldb/util/env_posix.cc
124129
leveldb_libleveldb_a_SOURCES += leveldb/util/filter_policy.cc
125130
leveldb_libleveldb_a_SOURCES += leveldb/util/hash.cc
126131
leveldb_libleveldb_a_SOURCES += leveldb/util/histogram.cc
@@ -129,21 +134,12 @@ leveldb_libleveldb_a_SOURCES += leveldb/util/options.cc
129134
leveldb_libleveldb_a_SOURCES += leveldb/util/status.cc
130135

131136
if TARGET_WINDOWS
132-
leveldb_libleveldb_a_SOURCES += leveldb/util/env_win.cc
133-
leveldb_libleveldb_a_SOURCES += leveldb/port/port_win.cc
137+
leveldb_libleveldb_a_SOURCES += leveldb/util/env_windows.cc
134138
else
135-
leveldb_libleveldb_a_SOURCES += leveldb/port/port_posix.cc
139+
leveldb_libleveldb_a_SOURCES += leveldb/util/env_posix.cc
136140
endif
137141

138142
leveldb_libmemenv_a_CPPFLAGS = $(leveldb_libleveldb_a_CPPFLAGS)
139143
leveldb_libmemenv_a_CXXFLAGS = $(leveldb_libleveldb_a_CXXFLAGS)
140144
leveldb_libmemenv_a_SOURCES = leveldb/helpers/memenv/memenv.cc
141145
leveldb_libmemenv_a_SOURCES += leveldb/helpers/memenv/memenv.h
142-
143-
leveldb_libleveldb_sse42_a_CPPFLAGS = $(leveldb_libleveldb_a_CPPFLAGS)
144-
leveldb_libleveldb_sse42_a_CXXFLAGS = $(leveldb_libleveldb_a_CXXFLAGS)
145-
if ENABLE_SSE42
146-
leveldb_libleveldb_sse42_a_CPPFLAGS += -DLEVELDB_PLATFORM_POSIX_SSE
147-
leveldb_libleveldb_sse42_a_CXXFLAGS += $(SSE42_CXXFLAGS)
148-
endif
149-
leveldb_libleveldb_sse42_a_SOURCES = leveldb/port/port_posix_sse.cc

‎src/crc32c/.appveyor.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Build matrix / environment variables are explained on:
2+
# https://www.appveyor.com/docs/appveyor-yml/
3+
# This file can be validated on: https://ci.appveyor.com/tools/validate-yaml
4+
5+
version: "{build}"
6+
7+
environment:
8+
matrix:
9+
# AppVeyor currently has no custom job name feature.
10+
# http://help.appveyor.com/discussions/questions/1623-can-i-provide-a-friendly-name-for-jobs
11+
- JOB: Visual Studio 2019
12+
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
13+
CMAKE_GENERATOR: Visual Studio 16 2019
14+
15+
platform:
16+
- x86
17+
- x64
18+
19+
configuration:
20+
- RelWithDebInfo
21+
- Debug
22+
23+
build_script:
24+
- git submodule update --init --recursive
25+
- mkdir build
26+
- cd build
27+
- if "%platform%"=="x86" (set CMAKE_GENERATOR_PLATFORM="Win32")
28+
else (set CMAKE_GENERATOR_PLATFORM="%platform%")
29+
- cmake --version
30+
- cmake .. -G "%CMAKE_GENERATOR%" -A "%CMAKE_GENERATOR_PLATFORM%"
31+
-DCMAKE_CONFIGURATION_TYPES="%CONFIGURATION%" -DCRC32C_USE_GLOG=0
32+
- cmake --build . --config "%CONFIGURATION%"
33+
- cd ..
34+
35+
test_script:
36+
- build\%CONFIGURATION%\crc32c_tests.exe
37+
- build\%CONFIGURATION%\crc32c_capi_tests.exe
38+
- build\%CONFIGURATION%\crc32c_bench.exe

‎src/crc32c/.clang-format

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: Google

0 commit comments

Comments
 (0)