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 /cpu_features.c | |
| 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 'cpu_features.c')
| -rw-r--r-- | cpu_features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu_features.c b/cpu_features.c index 6ef5aa2c4b..b5e7257696 100644 --- a/cpu_features.c +++ b/cpu_features.c @@ -18,7 +18,7 @@ Z_INTERNAL void cpu_check_features(void) { #elif defined(PPC_FEATURES) || defined(POWER_FEATURES) power_check_features(); #elif defined(S390_FEATURES) - s390_check_features(); + PREFIX(s390_check_features)(); #endif features_checked = 1; } |