lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

fixed 32-bits compilation

Browse Source
This commit is contained in:
Yann Collet
2016-07-22 05:02:27 +02:00
parent 32faf6c8e7
commit b752298d1d
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
programs/.gitignore vendored
View File

@ -11,6 +11,7 @@ zbufftest
zbufftest32 zbufftest32
datagen datagen
paramgrill paramgrill
paramgrill32
roundTripCrash roundTripCrash
# Object files # Object files

25
programs/Makefile
View File

@ -87,7 +87,9 @@ default: zstd
all: zstd fullbench fuzzer zbufftest paramgrill datagen all: zstd fullbench fuzzer zbufftest paramgrill datagen
all32: cleano32 zstd32 fullbench32 fuzzer32 zbufftest32 all32: CFLAGS += -m32
all32: EXT := 32$(EXT)
all32: cleano32 all
$(ZSTDDIR)/decompress/zstd_decompress.o: CFLAGS += $(ALIGN_LOOP) $(ZSTDDIR)/decompress/zstd_decompress.o: CFLAGS += $(ALIGN_LOOP)
@ -96,9 +98,8 @@ zstd : $(ZSTD_FILES) $(ZSTDLEGACY_FILES) $(ZBUFF_FILES) $(ZDICT_FILES) \
$(CC) $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT) $(CC) $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT)
zstd32: CFLAGS += -m32 zstd32: CFLAGS += -m32
zstd32: $(ZSTD_FILES) $(ZSTDLEGACY_FILES) $(ZBUFF_FILES) $(ZDICT_FILES) \ zstd32: EXT := 32$(EXT)
zstdcli.c fileio.c bench.c datagen.c dibio.c zstd32: zstd
$(CC) -m32 $(FLAGS) -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) $^ -o $@$(EXT)
zstd_nolegacy : zstd_nolegacy :
$(MAKE) zstd ZSTD_LEGACY_SUPPORT=0 $(MAKE) zstd ZSTD_LEGACY_SUPPORT=0
@ -131,22 +132,24 @@ zstd-small: clean
fullbench : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c fullbench.c fullbench : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c fullbench.c
$(CC) $(FLAGS) $^ -o $@$(EXT) $(CC) $(FLAGS) $^ -o $@$(EXT)
fullbench32: $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c fullbench.c fullbench32 : CFLAGS += -m32
$(CC) -m32 $(FLAGS) $^ -o $@$(EXT) fullbench32 : EXT := 32$(EXT)
fullbench32 : fullbench
fuzzer : CPPFLAGS += -I$(ZSTDDIR)/dictBuilder fuzzer : CPPFLAGS += -I$(ZSTDDIR)/dictBuilder
fuzzer : $(ZSTD_FILES) $(ZDICT_FILES) datagen.c fuzzer.c fuzzer : $(ZSTD_FILES) $(ZDICT_FILES) datagen.c fuzzer.c
$(CC) $(FLAGS) $^ -o $@$(EXT) $(CC) $(FLAGS) $^ -o $@$(EXT)
fuzzer32 : CPPFLAGS += -I$(ZSTDDIR)/dictBuilder fuzzer32 : CFLAGS += -m32
fuzzer32: $(ZSTD_FILES) $(ZDICT_FILES) datagen.c fuzzer.c fuzzer32 : EXT := 32$(EXT)
$(CC) -m32 $(FLAGS) $^ -o $@$(EXT) fuzzer32 : fuzzer
zbufftest : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c zbufftest.c zbufftest : $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c zbufftest.c
$(CC) $(FLAGS) $^ -o $@$(EXT) $(CC) $(FLAGS) $^ -o $@$(EXT)
zbufftest32: $(ZSTD_FILES) $(ZBUFF_FILES) datagen.c zbufftest.c zbufftest32 : CFLAGS += -m32
$(CC) -m32 $(FLAGS) $^ -o $@$(EXT) zbufftest32 : EXT := 32$(EXT)
zbufftest32 : zbufftest
paramgrill : $(ZSTD_FILES) datagen.c paramgrill.c paramgrill : $(ZSTD_FILES) datagen.c paramgrill.c
$(CC) $(FLAGS) $^ -lm -o $@$(EXT) $(CC) $(FLAGS) $^ -lm -o $@$(EXT)

8
tests/test-zstd-speed.py
View File

@ -7,12 +7,12 @@ import time
import traceback import traceback
import subprocess import subprocess
import signal import signal
default_repo_url = 'https://github.com/Cyan4973/zstd.git' default_repo_url = 'https://github.com/Cyan4973/zstd.git'
working_dir_name = 'speedTest' working_dir_name = 'speedTest'
working_path = os.getcwd() + '/' + working_dir_name # /path/to/zstd/tests/speedTest working_path = os.getcwd() + '/' + working_dir_name # /path/to/zstd/tests/speedTest
clone_path = working_path + '/' + 'zstd' # /path/to/zstd/tests/speedTest/zstd clone_path = working_path + '/' + 'zstd' # /path/to/zstd/tests/speedTest/zstd
email_header = '[ZSTD_speedTest]' email_header = '[ZSTD_speedTest]'
pid = str(os.getpid()) pid = str(os.getpid())
verbose = False verbose = False
@ -159,7 +159,7 @@ def test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, hav
local_branch = string.split(branch, '/')[1] local_branch = string.split(branch, '/')[1]
version = local_branch.rpartition('-')[2] + '_' + commit version = local_branch.rpartition('-')[2] + '_' + commit
if not args.dry_run: if not args.dry_run:
execute('make clean zstdprogram MOREFLAGS="-DZSTD_GIT_COMMIT=%s"' % version) execute('make clean zstd MOREFLAGS="-DZSTD_GIT_COMMIT=%s"' % version)
logFileName = working_path + "/log_" + branch.replace("/", "_") + ".txt" logFileName = working_path + "/log_" + branch.replace("/", "_") + ".txt"
text_to_send = [] text_to_send = []
results_files = "" results_files = ""