From 869712d3890bb400074ea0f862cac1ee5b8d09c7 Mon Sep 17 00:00:00 2001 From: Roy Oursler Date: Tue, 12 Jul 2016 15:32:48 -0700 Subject: [PATCH] igzip: Rename inflate.asm and fix Makefile.am so that Makefile.unx works Signed-off-by: Roy Oursler Reviewed-by: Greg Tucker --- igzip/Makefile.am | 11 ++++------- ...p_inflate.asm => igzip_decode_block_stateless.asm} | 0 igzip/igzip_decode_block_stateless_01.asm | 3 +++ igzip/igzip_decode_block_stateless_04.asm | 4 ++++ igzip/igzip_inflate_01.asm | 3 --- igzip/igzip_inflate_04.asm | 4 ---- 6 files changed, 11 insertions(+), 14 deletions(-) rename igzip/{igzip_inflate.asm => igzip_decode_block_stateless.asm} (100%) create mode 100644 igzip/igzip_decode_block_stateless_01.asm create mode 100644 igzip/igzip_decode_block_stateless_04.asm delete mode 100644 igzip/igzip_inflate_01.asm delete mode 100644 igzip/igzip_inflate_04.asm diff --git a/igzip/Makefile.am b/igzip/Makefile.am index 108d040..638b1b3 100644 --- a/igzip/Makefile.am +++ b/igzip/Makefile.am @@ -45,8 +45,8 @@ lsrc += igzip/igzip.c igzip/hufftables_c.c \ igzip/igzip_base.c \ igzip/igzip_update_histogram_01.asm \ igzip/igzip_update_histogram_04.asm \ - igzip/igzip_inflate_01.asm \ - igzip/igzip_inflate_04.asm \ + igzip/igzip_decode_block_stateless_01.asm \ + igzip/igzip_decode_block_stateless_04.asm \ igzip/igzip_inflate_multibinary.asm src_include += -I $(srcdir)/igzip @@ -77,11 +77,10 @@ other_src += igzip/bitbuf2.asm igzip/data_struct2.asm \ include/multibinary.asm \ include/test.h \ igzip/huffman.h \ - igzip/igzip_inflate.asm + igzip/igzip_decode_block_stateless.asm examples += igzip/igzip_example igzip/igzip_sync_flush_example -igzip_rand_test: igzip_igzip_rand_test_LDADD = libisal.la # Include tools to make custom Huffman tables based on sample data @@ -102,7 +101,5 @@ igzip_igzip_inflate_perf_LDFLAGS = -lz igzip_inflate_test: LDLIBS += -lz igzip_igzip_inflate_test_LDADD = libisal.la igzip_igzip_inflate_test_LDFLAGS = -lz -igzip_check: igzip_igzip_check_LDADD = libisal.la -igzip_hist_perf: igzip_inflate.o -igzip_igzip_hist_perf_LDADD = igzip/igzip_inflate.lo libisal.la +igzip_igzip_hist_perf_LDADD = libisal.la diff --git a/igzip/igzip_inflate.asm b/igzip/igzip_decode_block_stateless.asm similarity index 100% rename from igzip/igzip_inflate.asm rename to igzip/igzip_decode_block_stateless.asm diff --git a/igzip/igzip_decode_block_stateless_01.asm b/igzip/igzip_decode_block_stateless_01.asm new file mode 100644 index 0000000..4aa39fe --- /dev/null +++ b/igzip/igzip_decode_block_stateless_01.asm @@ -0,0 +1,3 @@ +%define ARCH 01 + +%include "igzip_decode_block_stateless.asm" diff --git a/igzip/igzip_decode_block_stateless_04.asm b/igzip/igzip_decode_block_stateless_04.asm new file mode 100644 index 0000000..769fca2 --- /dev/null +++ b/igzip/igzip_decode_block_stateless_04.asm @@ -0,0 +1,4 @@ +%define ARCH 04 +%define USE_HSWNI + +%include "igzip_decode_block_stateless.asm" diff --git a/igzip/igzip_inflate_01.asm b/igzip/igzip_inflate_01.asm deleted file mode 100644 index 2bee2e0..0000000 --- a/igzip/igzip_inflate_01.asm +++ /dev/null @@ -1,3 +0,0 @@ -%define ARCH 01 - -%include "igzip_inflate.asm" diff --git a/igzip/igzip_inflate_04.asm b/igzip/igzip_inflate_04.asm deleted file mode 100644 index 43467fa..0000000 --- a/igzip/igzip_inflate_04.asm +++ /dev/null @@ -1,4 +0,0 @@ -%define ARCH 04 -%define USE_HSWNI - -%include "igzip_inflate.asm"