LZX, LZMS: Annotate unaligned memory accesses in x86 filtering

[wimlib] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a7304ce5ba567ae18066b299837ddbdf4c3d25d7..2c94bdcb9288d4daad065fdb5cb070b2f02e5784 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ endif
 
 lib_LTLIBRARIES = libwim.la
 
-libwim_la_LDFLAGS = -version-info 15:0:0 $(WINDOWS_LDFLAGS)
+libwim_la_LDFLAGS = -version-info 17:0:2 $(WINDOWS_LDFLAGS)
 
 libwim_la_SOURCES =            \
        src/add_image.c         \
@@ -41,11 +41,17 @@ libwim_la_SOURCES =         \
        src/iterate_dir.c       \
        src/join.c              \
        src/lookup_table.c      \
+       src/lz_binary_trees.c   \
+       src/lz_hash_chains.c    \
+       src/lz_lcp_interval_tree.c      \
+       src/lz_linked_suffix_array.c    \
+       src/lz_mf.c             \
+       src/lz_null.c           \
+       src/lz_repsearch.c      \
+       src/lz_suffix_array_utils.c     \
        src/lzms-common.c       \
        src/lzms-compress.c     \
        src/lzms-decompress.c   \
-       src/lz_hash.c           \
-       src/lz_sarray.c         \
        src/lzx-common.c        \
        src/lzx-compress.c      \
        src/lzx-decompress.c    \
@@ -53,6 +59,7 @@ libwim_la_SOURCES =           \
        src/mount_image.c       \
        src/pathlist.c          \
        src/paths.c             \
+       src/progress.c          \
        src/resource.c          \
        src/reference.c         \
        src/security.c          \
@@ -97,12 +104,16 @@ libwim_la_SOURCES =                \
        include/wimlib/integrity.h      \
        include/wimlib/list.h           \
        include/wimlib/lookup_table.h   \
-       include/wimlib/lz.h             \
-       include/wimlib/lz_hash.h        \
-       include/wimlib/lz_optimal.h     \
-       include/wimlib/lz_sarray.h      \
+       include/wimlib/lz_extend.h      \
+       include/wimlib/lz_hash3.h       \
+       include/wimlib/lz_mf.h          \
+       include/wimlib/lz_mf_ops.h      \
+       include/wimlib/lz_repsearch.h   \
+       include/wimlib/lz_suffix_array_utils.h  \
        include/wimlib/lzms.h           \
+       include/wimlib/lzms_constants.h \
        include/wimlib/lzx.h            \
+       include/wimlib/lzx_constants.h  \
        include/wimlib/metadata.h       \
        include/wimlib/pathlist.h       \
        include/wimlib/paths.h          \
@@ -115,6 +126,7 @@ libwim_la_SOURCES =         \
        include/wimlib/textfile.h       \
        include/wimlib/timestamp.h      \
        include/wimlib/types.h          \
+       include/wimlib/unaligned.h      \
        include/wimlib/unix_data.h      \
        include/wimlib/util.h           \
        include/wimlib/version.h        \
@@ -149,12 +161,13 @@ endif
 
 EXTRA_libwim_la_SOURCES = src/sha1-ssse3.asm
 libwim_la_DEPENDENCIES = $(SSSE3_SHA1_OBJ)
-STRIP_FPIC = sh $(top_srcdir)/build-aux/strip_fPIC.sh
 
-sha1-ssse3.lo:src/sha1-ssse3.asm
-       $(LIBTOOL) --mode=compile --tag=CC $(STRIP_FPIC) $(NASM) -f elf64 \
-       -DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=ssse3_not_found \
-       $<
+src/sha1-ssse3.lo:src/sha1-ssse3.asm
+       $(LIBTOOL) --mode=compile --tag NASM $(srcdir)/build-aux/nasm_lt.sh \
+       $(NASM) $(NAFLAGS) $(NASM_WINDOWS_FLAGS)                            \
+       -DINTEL_SHA1_UPDATE_FUNCNAME=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_ssse3       \
+       -DINTEL_SHA1_UPDATE_DEFAULT_DISPATCH=$(NASM_SYMBOL_PREFIX)sha1_transform_blocks_default  \
+       $< -o $@
 
 libwim_la_LIBADD =             \
        $(LIBXML2_LIBS)         \
@@ -164,8 +177,7 @@ libwim_la_LIBADD =          \
        $(LTLIBICONV)           \
        $(LIBCRYPTO_LIBS)       \
        $(SSSE3_SHA1_OBJ)       \
-       $(PTHREAD_LDADD)        \
-       $(WINDOWS_LDADD)
+       $(PTHREAD_LDADD)
 
 libwim_la_CFLAGS =             \
        $(AM_CFLAGS)            \
@@ -204,7 +216,8 @@ imagex_cmds =       append  \
                optimize\
                split   \
                unmount \
-               update
+               update  \
+               verify
 
 install-exec-hook:
        if [ "@IMAGEX_PROGNAME@" != imagex ]; then                          \
@@ -239,11 +252,15 @@ dist_bin_SCRIPTS = programs/mkwinpeimg
 include_HEADERS = include/wimlib.h
 
 EXTRA_DIST =                                   \
-       build-aux/strip_fPIC.sh                 \
+       build-aux/nasm_lt.sh                    \
        archlinux                               \
        debian                                  \
        rpm                                     \
        examples                                \
+       COPYING                                 \
+       COPYING.GPLv3                           \
+       COPYING.LGPLv3                          \
+       README                                  \
        README.WINDOWS                          \
        tests/common_tests.sh                   \
        tests/tests-common.sh                   \
@@ -274,6 +291,7 @@ wimlib_manpages =                           \
        doc/man1/@IMAGEX_PROGNAME@-split.1              \
        doc/man1/@IMAGEX_PROGNAME@-unmount.1            \
        doc/man1/@IMAGEX_PROGNAME@-update.1             \
+       doc/man1/@IMAGEX_PROGNAME@-verify.1             \
        doc/man1/mkwinpeimg.1
 
 man1_MANS = $(wimlib_manpages)