Merge branch 'dev' into multiframe

diff --cc programs/bench.c
Simple merge

diff --cc programs/util.h
Simple merge

diff --cc tests/Makefile
index d36059eccf0e89b6035829dc28e6f2c82374cbfd,a6f3ada622e932d80738780a86d28e07fc73a62b..f64be1695b4936f93c7694d9b5a8a835344ecd48
--- 1/tests/Makefile
--- 2/tests/Makefile
+++ b/tests/Makefile
@@@ -230,7 -225,10 +230,10 @@@ zstd-playTests: datage
        file $(ZSTD)
        ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST)
  
- test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries test-pool test-legacy
 -test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries
++test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries test-legacy
+ ifneq ($(QEMU_SYS),qemu-ppc64-static)
+ test: test-pool
+ endif
  
  test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zstream32
  

diff --cc tests/fuzzer.c
Simple merge