diff options
| author | Ilya Leoshkevich <iii@linux.ibm.com> | 2022-04-12 15:16:20 +0200 |
|---|---|---|
| committer | Hans Kristian Rosbach <hk-github@circlestorm.org> | 2022-04-27 10:37:43 +0200 |
| commit | 9be98893aaf69892811d617122e28ea2dd8e17ba (patch) | |
| tree | 9c73e2354905e01881b0091c63835f6e84342cfd /test | |
| parent | bb89b77f78bfba795c7846f5ce68430bd332685f (diff) | |
| download | Project-Tick-9be98893aaf69892811d617122e28ea2dd8e17ba.tar.gz Project-Tick-9be98893aaf69892811d617122e28ea2dd8e17ba.zip | |
Use PREFIX() for some of the Z_INTERNAL symbols
https://github.com/powturbo/TurboBench links zlib and zlib-ng into the
same binary, causing non-static symbol conflicts. Fix by using PREFIX()
for flush_pending(), bi_reverse(), inflate_ensure_window() and all of
the IBM Z symbols.
Note: do not use an explicit zng_, since one of the long-term goals is
to be able to link two versions of zlib-ng into the same binary for
benchmarking [1].
[1] https://github.com/zlib-ng/zlib-ng/pull/1248#issuecomment-1096648932
Diffstat (limited to 'test')
| -rw-r--r-- | test/benchmarks/benchmark_crc32.cc | 2 | ||||
| -rw-r--r-- | test/test_crc32.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/benchmarks/benchmark_crc32.cc b/test/benchmarks/benchmark_crc32.cc index 5908116f1c..06a11cfa0e 100644 --- a/test/benchmarks/benchmark_crc32.cc +++ b/test/benchmarks/benchmark_crc32.cc @@ -62,7 +62,7 @@ BENCHMARK_CRC32(acle, crc32_acle, arm_cpu_has_crc32); #elif defined(POWER8_VSX_CRC32) BENCHMARK_CRC32(power8, crc32_power8, power_cpu_has_arch_2_07); #elif defined(S390_CRC32_VX) -BENCHMARK_CRC32(vx, s390_crc32_vx, s390_cpu_has_vx); +BENCHMARK_CRC32(vx, PREFIX(s390_crc32_vx), PREFIX(s390_cpu_has_vx)); #elif defined(X86_PCLMULQDQ_CRC) /* CRC32 fold does a memory copy while hashing */ BENCHMARK_CRC32(pclmulqdq, crc32_pclmulqdq, x86_cpu_has_pclmulqdq); diff --git a/test/test_crc32.cc b/test/test_crc32.cc index af0dd3b784..f76f838adf 100644 --- a/test/test_crc32.cc +++ b/test/test_crc32.cc @@ -213,7 +213,7 @@ TEST_CRC32(acle, crc32_acle, arm_cpu_has_crc32) #elif defined(POWER8_VSX_CRC32) TEST_CRC32(power8, crc32_power8, power_cpu_has_arch_2_07) #elif defined(S390_CRC32_VX) -TEST_CRC32(vx, s390_crc32_vx, s390_cpu_has_vx) +TEST_CRC32(vx, PREFIX(s390_crc32_vx), PREFIX(s390_cpu_has_vx)) #elif defined(X86_PCLMULQDQ_CRC) TEST_CRC32(pclmulqdq, crc32_pclmulqdq, x86_cpu_has_pclmulqdq) #endif |