Update lzo to 2.10

author: Arne Schwabe <arne@rfc2549.org> 2017-06-22 18:33:26 +0200
committer: Arne Schwabe <arne@rfc2549.org> 2017-06-22 18:33:26 +0200
commit: 6c12bd2094234edc1a129969b89cf45b1da889bd (patch)
tree: a39b3af9ad861334a844035d4d88232c8f9ed0ec /main/lzo/asm/i386
parent: f35afa13da08a058bc28ca0e535e044093148e3a (diff)
96 files changed, 102 insertions, 2256 deletions
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1c_s2.o b/main/lzo/asm/i386/obj/coff32/lzo1c_s2.o
deleted file mode 100644
index 6a3fdf9f..00000000
--- a/main/lzo/asm/i386/obj/coff32/lzo1c_s2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1f_f2.o b/main/lzo/asm/i386/obj/coff32/lzo1f_f2.o
deleted file mode 100644
index 79b5727f..00000000
--- a/main/lzo/asm/i386/obj/coff32/lzo1f_f2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1x_f2.o b/main/lzo/asm/i386/obj/coff32/lzo1x_f2.o
deleted file mode 100644
index 3476817b..00000000
--- a/main/lzo/asm/i386/obj/coff32/lzo1x_f2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1x_s2.o b/main/lzo/asm/i386/obj/coff32/lzo1x_s2.o
deleted file mode 100644
index f45ef13a..00000000
--- a/main/lzo/asm/i386/obj/coff32/lzo1x_s2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1y_f2.o b/main/lzo/asm/i386/obj/coff32/lzo1y_f2.o
deleted file mode 100644
index 0ed51177..00000000
--- a/main/lzo/asm/i386/obj/coff32/lzo1y_f2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/coff32/lzo1y_s2.o b/main/lzo/asm/i386/obj/coff32/lzo1y_s2.o
deleted file mode 100644
index efc08299..00000000
--- a/main/lzo/asm/i386/obj/coff32/lzo1y_s2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o b/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
index 59f320eb..eb4429e2 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1c_s1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1c_s2.o b/main/lzo/asm/i386/obj/elf32/lzo1c_s2.o
deleted file mode 100644
index 90622c99..00000000
--- a/main/lzo/asm/i386/obj/elf32/lzo1c_s2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o b/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
index 064b1c53..3134a85f 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1f_f1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1f_f2.o b/main/lzo/asm/i386/obj/elf32/lzo1f_f2.o
deleted file mode 100644
index f70f7909..00000000
--- a/main/lzo/asm/i386/obj/elf32/lzo1f_f2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o b/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
index 470fb753..fc96ecce 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1x_f1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1x_f2.o b/main/lzo/asm/i386/obj/elf32/lzo1x_f2.o
deleted file mode 100644
index bb2e720c..00000000
--- a/main/lzo/asm/i386/obj/elf32/lzo1x_f2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o b/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
index 8483013b..817386dd 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1x_s1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1x_s2.o b/main/lzo/asm/i386/obj/elf32/lzo1x_s2.o
deleted file mode 100644
index ce5dfc47..00000000
--- a/main/lzo/asm/i386/obj/elf32/lzo1x_s2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o b/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
index 5ac4a8fd..15300e80 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1y_f1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1y_f2.o b/main/lzo/asm/i386/obj/elf32/lzo1y_f2.o
deleted file mode 100644
index 4d510760..00000000
--- a/main/lzo/asm/i386/obj/elf32/lzo1y_f2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o b/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
index eb265ab8..2fdd42e4 100644
--- a/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
+++ b/main/lzo/asm/i386/obj/elf32/lzo1y_s1.o
diff --git a/main/lzo/asm/i386/obj/elf32/lzo1y_s2.o b/main/lzo/asm/i386/obj/elf32/lzo1y_s2.o
deleted file mode 100644
index 691d4094..00000000
--- a/main/lzo/asm/i386/obj/elf32/lzo1y_s2.o
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1c_s2.obj b/main/lzo/asm/i386/obj/omf32/lzo1c_s2.obj
deleted file mode 100644
index 77118989..00000000
--- a/main/lzo/asm/i386/obj/omf32/lzo1c_s2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1f_f2.obj b/main/lzo/asm/i386/obj/omf32/lzo1f_f2.obj
deleted file mode 100644
index 7d117984..00000000
--- a/main/lzo/asm/i386/obj/omf32/lzo1f_f2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1x_f2.obj b/main/lzo/asm/i386/obj/omf32/lzo1x_f2.obj
deleted file mode 100644
index b3f6364e..00000000
--- a/main/lzo/asm/i386/obj/omf32/lzo1x_f2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1x_s2.obj b/main/lzo/asm/i386/obj/omf32/lzo1x_s2.obj
deleted file mode 100644
index 8af7727a..00000000
--- a/main/lzo/asm/i386/obj/omf32/lzo1x_s2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1y_f2.obj b/main/lzo/asm/i386/obj/omf32/lzo1y_f2.obj
deleted file mode 100644
index 0dde89a2..00000000
--- a/main/lzo/asm/i386/obj/omf32/lzo1y_f2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/omf32/lzo1y_s2.obj b/main/lzo/asm/i386/obj/omf32/lzo1y_s2.obj
deleted file mode 100644
index 85f6b811..00000000
--- a/main/lzo/asm/i386/obj/omf32/lzo1y_s2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj b/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
index ef6189c7..b9703e8c 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1c_s1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1c_s2.obj b/main/lzo/asm/i386/obj/win32/lzo1c_s2.obj
deleted file mode 100644
index a67fd5c5..00000000
--- a/main/lzo/asm/i386/obj/win32/lzo1c_s2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj b/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
index 83bafa91..e0c0295f 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1f_f1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1f_f2.obj b/main/lzo/asm/i386/obj/win32/lzo1f_f2.obj
deleted file mode 100644
index 7c6263ac..00000000
--- a/main/lzo/asm/i386/obj/win32/lzo1f_f2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj b/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
index 83dc586a..c6c1f806 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1x_f1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1x_f2.obj b/main/lzo/asm/i386/obj/win32/lzo1x_f2.obj
deleted file mode 100644
index 6307e9ef..00000000
--- a/main/lzo/asm/i386/obj/win32/lzo1x_f2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj b/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
index dff65d3b..b95eb969 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1x_s1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1x_s2.obj b/main/lzo/asm/i386/obj/win32/lzo1x_s2.obj
deleted file mode 100644
index c19f527f..00000000
--- a/main/lzo/asm/i386/obj/win32/lzo1x_s2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj b/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
index 5c0d1c2d..30827912 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1y_f1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1y_f2.obj b/main/lzo/asm/i386/obj/win32/lzo1y_f2.obj
deleted file mode 100644
index 75640fdd..00000000
--- a/main/lzo/asm/i386/obj/win32/lzo1y_f2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj b/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
index 68c5d30d..1c34c7be 100644
--- a/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
+++ b/main/lzo/asm/i386/obj/win32/lzo1y_s1.obj
diff --git a/main/lzo/asm/i386/obj/win32/lzo1y_s2.obj b/main/lzo/asm/i386/obj/win32/lzo1y_s2.obj
deleted file mode 100644
index 38b025ee..00000000
--- a/main/lzo/asm/i386/obj/win32/lzo1y_s2.obj
+++ /dev/null
diff --git a/main/lzo/asm/i386/src/enter.ash b/main/lzo/asm/i386/src/enter.ash
index fbfc9b8b..cc5941b9 100644
--- a/main/lzo/asm/i386/src/enter.ash
+++ b/main/lzo/asm/i386/src/enter.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/leave.ash b/main/lzo/asm/i386/src/leave.ash
index 209e2bbd..dbaeda03 100644
--- a/main/lzo/asm/i386/src/leave.ash
+++ b/main/lzo/asm/i386/src/leave.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1c_d.ash b/main/lzo/asm/i386/src/lzo1c_d.ash
index d373ed26..0d410243 100644
--- a/main/lzo/asm/i386/src/lzo1c_d.ash
+++ b/main/lzo/asm/i386/src/lzo1c_d.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1c_s1.S b/main/lzo/asm/i386/src/lzo1c_s1.S
index 2de44637..03ca397b 100644
--- a/main/lzo/asm/i386/src/lzo1c_s1.S
+++ b/main/lzo/asm/i386/src/lzo1c_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1c_s2.S b/main/lzo/asm/i386/src/lzo1c_s2.S
deleted file mode 100644
index f874002e..00000000
--- a/main/lzo/asm/i386/src/lzo1c_s2.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/* lzo1c_s2.S -- LZO1C decompression in assembler (i386 + gcc)
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_TEST_DECOMPRESS_OVERRUN_INPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
-
-#include "lzo_asm.h"
-
-    .text
-
-    LZO_PUBLIC(lzo1c_decompress_asm_safe)
-
-#include "enter.ash"
-#include "lzo1c_d.ash"
-#include "leave.ash"
-
-    LZO_PUBLIC_END(lzo1c_decompress_asm_safe)
-
-
-/*
-vi:ts=4
-*/
-
diff --git a/main/lzo/asm/i386/src/lzo1f_d.ash b/main/lzo/asm/i386/src/lzo1f_d.ash
index edbe0a6a..99093f68 100644
--- a/main/lzo/asm/i386/src/lzo1f_d.ash
+++ b/main/lzo/asm/i386/src/lzo1f_d.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1f_f1.S b/main/lzo/asm/i386/src/lzo1f_f1.S
index b77c8943..212b62f4 100644
--- a/main/lzo/asm/i386/src/lzo1f_f1.S
+++ b/main/lzo/asm/i386/src/lzo1f_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1f_f2.S b/main/lzo/asm/i386/src/lzo1f_f2.S
deleted file mode 100644
index 904a5f31..00000000
--- a/main/lzo/asm/i386/src/lzo1f_f2.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/* lzo1f_f2.S -- fast LZO1F decompression in assembler (i386 + gcc)
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_TEST_DECOMPRESS_OVERRUN_INPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
-
-#include "lzo_asm.h"
-
-    .text
-
-    LZO_PUBLIC(lzo1f_decompress_asm_fast_safe)
-
-#include "enter.ash"
-#include "lzo1f_d.ash"
-#include "leave.ash"
-
-    LZO_PUBLIC_END(lzo1f_decompress_asm_fast_safe)
-
-
-/*
-vi:ts=4
-*/
-
diff --git a/main/lzo/asm/i386/src/lzo1x_d.ash b/main/lzo/asm/i386/src/lzo1x_d.ash
index 35d1ca4f..4635a2ad 100644
--- a/main/lzo/asm/i386/src/lzo1x_d.ash
+++ b/main/lzo/asm/i386/src/lzo1x_d.ash
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1x_f1.S b/main/lzo/asm/i386/src/lzo1x_f1.S
index 20810526..4f02add5 100644
--- a/main/lzo/asm/i386/src/lzo1x_f1.S
+++ b/main/lzo/asm/i386/src/lzo1x_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1x_f2.S b/main/lzo/asm/i386/src/lzo1x_f2.S
deleted file mode 100644
index f9ad6b32..00000000
--- a/main/lzo/asm/i386/src/lzo1x_f2.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/* lzo1x_f2.S -- fast LZO1X decompression in assembler (i386 + gcc)
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_FAST
-
-#define LZO_TEST_DECOMPRESS_OVERRUN_INPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
-
-#include "lzo_asm.h"
-
-    .text
-
-    LZO_PUBLIC(lzo1x_decompress_asm_fast_safe)
-
-#include "enter.ash"
-#include "lzo1x_d.ash"
-#include "leave.ash"
-
-    LZO_PUBLIC_END(lzo1x_decompress_asm_fast_safe)
-
-
-/*
-vi:ts=4
-*/
-
diff --git a/main/lzo/asm/i386/src/lzo1x_s1.S b/main/lzo/asm/i386/src/lzo1x_s1.S
index c034d7a3..d706fc2a 100644
--- a/main/lzo/asm/i386/src/lzo1x_s1.S
+++ b/main/lzo/asm/i386/src/lzo1x_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1x_s2.S b/main/lzo/asm/i386/src/lzo1x_s2.S
deleted file mode 100644
index aaa294de..00000000
--- a/main/lzo/asm/i386/src/lzo1x_s2.S
+++ /dev/null
@@ -1,68 +0,0 @@
-/* lzo1x_s2.S -- LZO1X decompression in assembler (i386 + gcc)
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_TEST_DECOMPRESS_OVERRUN_INPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
-
-#include "lzo_asm.h"
-
-    .text
-
-    LZO_PUBLIC(lzo1x_decompress_asm_safe)
-
-#include "enter.ash"
-#include "lzo1x_d.ash"
-#include "leave.ash"
-
-    LZO_PUBLIC_END(lzo1x_decompress_asm_safe)
-
-
-/*
-vi:ts=4
-*/
-
diff --git a/main/lzo/asm/i386/src/lzo1y_f1.S b/main/lzo/asm/i386/src/lzo1y_f1.S
index 2fbd0228..2982c32d 100644
--- a/main/lzo/asm/i386/src/lzo1y_f1.S
+++ b/main/lzo/asm/i386/src/lzo1y_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1y_f2.S b/main/lzo/asm/i386/src/lzo1y_f2.S
deleted file mode 100644
index 2dace850..00000000
--- a/main/lzo/asm/i386/src/lzo1y_f2.S
+++ /dev/null
@@ -1,72 +0,0 @@
-/* lzo1y_f2.S -- fast LZO1Y decompression in assembler (i386 + gcc)
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_FAST
-
-#define LZO_TEST_DECOMPRESS_OVERRUN_INPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
-
-#include "lzo_asm.h"
-
-    .text
-
-    LZO_PUBLIC(lzo1y_decompress_asm_fast_safe)
-
-#define LZO1Y
-
-#include "enter.ash"
-#include "lzo1x_d.ash"
-#include "leave.ash"
-
-    LZO_PUBLIC_END(lzo1y_decompress_asm_fast_safe)
-
-
-/*
-vi:ts=4
-*/
-
diff --git a/main/lzo/asm/i386/src/lzo1y_s1.S b/main/lzo/asm/i386/src/lzo1y_s1.S
index 245a8f7a..ddf8574a 100644
--- a/main/lzo/asm/i386/src/lzo1y_s1.S
+++ b/main/lzo/asm/i386/src/lzo1y_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src/lzo1y_s2.S b/main/lzo/asm/i386/src/lzo1y_s2.S
deleted file mode 100644
index 238c762e..00000000
--- a/main/lzo/asm/i386/src/lzo1y_s2.S
+++ /dev/null
@@ -1,70 +0,0 @@
-/* lzo1y_s2.S -- LZO1Y decompression in assembler (i386 + gcc)
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-
-/***********************************************************************
-//
-************************************************************************/
-
-#define LZO_TEST_DECOMPRESS_OVERRUN_INPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_OUTPUT
-#define LZO_TEST_DECOMPRESS_OVERRUN_LOOKBEHIND
-
-#include "lzo_asm.h"
-
-    .text
-
-    LZO_PUBLIC(lzo1y_decompress_asm_safe)
-
-#define LZO1Y
-
-#include "enter.ash"
-#include "lzo1x_d.ash"
-#include "leave.ash"
-
-    LZO_PUBLIC_END(lzo1y_decompress_asm_safe)
-
-
-/*
-vi:ts=4
-*/
-
diff --git a/main/lzo/asm/i386/src/lzo_asm.h b/main/lzo/asm/i386/src/lzo_asm.h
index 538b4089..7227b31a 100644
--- a/main/lzo/asm/i386/src/lzo_asm.h
+++ b/main/lzo/asm/i386/src/lzo_asm.h
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_gas/all/asm_all.S b/main/lzo/asm/i386/src_gas/all/asm_all.S
index 730ed07a..8aa67cbe 100644
--- a/main/lzo/asm/i386/src_gas/all/asm_all.S
+++ b/main/lzo/asm/i386/src_gas/all/asm_all.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -27,17 +27,31 @@
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
+#undef _
 #ifndef NAME1
-#if (defined(__MACH__) && defined(__APPLE__))
+#if defined(__ELF__)
+#  define NAME1(a)           a
+#elif (defined(__MACH__) && defined(__APPLE__))
+#  define NAME1(a)      _ ## a
+#elif defined(_WIN32) && !defined(_WIN64)
 #  define NAME1(a)      _ ## a
+#elif defined(_WIN64)
+#  define NAME1(a)           a
 #else
 #  define NAME1(a)      _ ## a
 #  define NAME2(a)           a
 #endif
 #endif
+#define XNAME(a,b,c)    LZO_PP_ECONCAT3(NAME1(a),b,c)
 #ifndef LZO_PP_CONCAT2
 #  define LZO_PP_CONCAT2(a,b)   a ## b
 #endif
+#ifndef LZO_PP_CONCAT3
+#  define LZO_PP_CONCAT3(a,b,c) a ## b ## c
+#endif
+#ifndef LZO_PP_ECONCAT3
+#  define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c)
+#endif
 #ifndef p2align
 #  define p2align(a)        .p2align a
 #endif
@@ -50,38 +64,38 @@
 #  elif (defined(__MACH__) && defined(__APPLE__))
 #    define hiddenf(a)      .private_extern a
 #  else
-#    define hiddenf(a)
+#    define hiddenf(a)      
 #  endif
 #endif
 #ifndef typef
 #  if defined(__ELF__)
 #    define typef(a)        .type a,@function
 #  else
-#    define typef(a)
+#    define typef(a)        
 #  endif
 #endif
 #ifndef sizef
 #  if defined(__ELF__)
 #    define sizef(a,b)      .size a,b
 #  else
-#    define sizef(a,b)
+#    define sizef(a,b)      
 #  endif
 #endif
 #if defined(__ELF__)
 .section .note.GNU-stack,"",@progbits
 #endif
 .text
-#if defined(_WIN32) || defined(__WIN32__)
-#  if defined(LZO_WIN32_FEAT_00)
-#    LZO_WIN32_FEAT_00
-#  else
+#if defined(_WIN32) && !defined(_WIN64)
+#if defined(LZO_WIN32_FEAT_00)
+LZO_WIN32_FEAT_00
+#else
 #if defined(__GNUC__) && !defined(__clang__)
 .globl @feat.00
 #endif
 @feat.00 = 1
-#  endif
 #endif
-#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__)
+#endif
+#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(_WIN64)
 p2align(6)
 #else
 p2align(4)
diff --git a/main/lzo/asm/i386/src_gas/asminit.def b/main/lzo/asm/i386/src_gas/asminit.def
index 257190d0..0f1859ef 100644
--- a/main/lzo/asm/i386/src_gas/asminit.def
+++ b/main/lzo/asm/i386/src_gas/asminit.def
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
@@ -25,18 +25,32 @@
    http://www.oberhumer.com/opensource/lzo/
  */
 
+#undef _
 #ifndef NAME1
-#if (defined(__MACH__) && defined(__APPLE__))
+#if defined(__ELF__)
+#  define NAME1(a)           a
+#elif (defined(__MACH__) && defined(__APPLE__))
+#  define NAME1(a)      _ ## a
+#elif defined(_WIN32) && !defined(_WIN64)
 #  define NAME1(a)      _ ## a
+#elif defined(_WIN64)
+#  define NAME1(a)           a
 #else
 #  define NAME1(a)      _ ## a
 #  define NAME2(a)           a
 #endif
 #endif
+#define XNAME(a,b,c)    LZO_PP_ECONCAT3(NAME1(a),b,c)
 
 #ifndef LZO_PP_CONCAT2
 #  define LZO_PP_CONCAT2(a,b)   a ## b
 #endif
+#ifndef LZO_PP_CONCAT3
+#  define LZO_PP_CONCAT3(a,b,c) a ## b ## c
+#endif
+#ifndef LZO_PP_ECONCAT3
+#  define LZO_PP_ECONCAT3(a,b,c) LZO_PP_CONCAT3(a,b,c)
+#endif
 
 #ifndef p2align
 #  define p2align(a)        .p2align a
@@ -50,21 +64,21 @@
 #  elif (defined(__MACH__) && defined(__APPLE__))
 #    define hiddenf(a)      .private_extern a
 #  else
-#    define hiddenf(a)
+#    define hiddenf(a)      /*empty*/
 #  endif
 #endif
 #ifndef typef
 #  if defined(__ELF__)
 #    define typef(a)        .type a,@function
 #  else
-#    define typef(a)
+#    define typef(a)        /*empty*/
 #  endif
 #endif
 #ifndef sizef
 #  if defined(__ELF__)
 #    define sizef(a,b)      .size a,b
 #  else
-#    define sizef(a,b)
+#    define sizef(a,b)      /*empty*/
 #  endif
 #endif
 
@@ -72,17 +86,17 @@
 .section .note.GNU-stack,"",@progbits
 #endif
 .text
-#if defined(_WIN32) || defined(__WIN32__)
-#  if defined(LZO_WIN32_FEAT_00)
-#    LZO_WIN32_FEAT_00
-#  else
+#if defined(_WIN32) && !defined(_WIN64)
+#if defined(LZO_WIN32_FEAT_00)
+LZO_WIN32_FEAT_00
+#else
 #if defined(__GNUC__) && !defined(__clang__)
 .globl @feat.00
 #endif
 @feat.00 = 1
-#  endif
 #endif
-#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(__WIN64__)
+#endif
+#if defined(__ELF__) || (defined(__MACH__) && defined(__APPLE__)) || defined(_WIN32) || defined(_WIN64)
 p2align(6)
 #else
 p2align(4)
diff --git a/main/lzo/asm/i386/src_gas/lzo1c_s1.S b/main/lzo/asm/i386/src_gas/lzo1c_s1.S
index 4f15ca8f..374e60f0 100644
--- a/main/lzo/asm/i386/src_gas/lzo1c_s1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1c_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_gas/lzo1c_s2.S b/main/lzo/asm/i386/src_gas/lzo1c_s2.S
deleted file mode 100644
index 1797cc34..00000000
--- a/main/lzo/asm/i386/src_gas/lzo1c_s2.S
+++ /dev/null
@@ -1,98 +0,0 @@
-/* lzo1c_s2.S -- lzo1c_decompress_asm_safe
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-/***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-#include "asminit.def"
-#ifdef NAME1
-typef(NAME1(lzo1c_decompress_asm_safe))
-#endif
-#ifdef NAME2
-typef(NAME2(lzo1c_decompress_asm_safe))
-#endif
-#ifdef NAME1
-globalf(NAME1(lzo1c_decompress_asm_safe))
-#endif
-#ifdef NAME2
-globalf(NAME2(lzo1c_decompress_asm_safe))
-#endif
-#ifdef NAME1
-NAME1(lzo1c_decompress_asm_safe):
-#endif
-#ifdef NAME2
-NAME2(lzo1c_decompress_asm_safe):
-#endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0
-db 49,192,138,6,70,60,32,115,40,8,192,116,99,137,193,141
-db 28,15,57,28,36,15,130,107,1,0,0,141,28,14,57,92
-db 36,4,15,130,87,1,0,0,243,164,138,6,70,60,32,114
-db 127,60,64,15,130,169,0,0,0,137,193,36,31,141,87,255
-db 193,233,5,41,194,138,6,70,193,224,5,41,194,65,135,242
-db 59,116,36,48,15,130,51,1,0,0,141,28,15,57,28,36
-db 15,130,32,1,0,0,243,164,137,214,235,148,141,116,38,0
-db 138,6,70,141,72,32,60,248,114,149,185,24,1,0,0,44
-db 248,116,6,145,48,192,211,224,145,141,28,15,57,28,36,15
-db 130,241,0,0,0,141,28,14,57,92,36,4,15,130,221,0
-db 0,0,243,164,233,87,255,255,255,141,180,38,0,0,0,0
-db 141,87,255,41,194,138,6,70,193,224,5,41,194,135,242,59
-db 116,36,48,15,130,196,0,0,0,141,95,4,57,28,36,15
-db 130,177,0,0,0,164,164,164,137,214,164,49,192,233,72,255
-db 255,255,36,31,137,193,117,26,177,31,138,6,70,8,192,117
-db 15,129,193,255,0,0,0,235,241,141,180,38,0,0,0,0
-db 1,193,138,6,70,137,195,36,63,137,250,41,194,138,6,70
-db 193,224,6,41,194,57,250,116,41,135,214,141,73,3,59,116
-db 36,48,114,105,141,4,15,57,4,36,114,90,243,164,137,214
-db 49,192,193,235,6,137,217,15,133,210,254,255,255,233,190,254
-db 255,255,131,249,1,15,149,192,59,60,36,119,57,139,84,36
-db 40,3,84,36,44,57,214,119,38,114,29,43,124,36,48,139
-db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93
-db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184
-db 4,0,0,0,235,213,184,5,0,0,0,235,206,184,6,0
-db 0,0,235,199,141,182,0,0,0,0,141,191,0,0,0,0
-#ifdef NAME1
-sizef(NAME1(lzo1c_decompress_asm_safe),.-NAME1(lzo1c_decompress_asm_safe))
-#endif
-#ifdef NAME2
-sizef(NAME2(lzo1c_decompress_asm_safe),.-NAME2(lzo1c_decompress_asm_safe))
-#endif
diff --git a/main/lzo/asm/i386/src_gas/lzo1f_f1.S b/main/lzo/asm/i386/src_gas/lzo1f_f1.S
index a2c3c4e4..4c5427bb 100644
--- a/main/lzo/asm/i386/src_gas/lzo1f_f1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1f_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_gas/lzo1f_f2.S b/main/lzo/asm/i386/src_gas/lzo1f_f2.S
deleted file mode 100644
index f2041bc7..00000000
--- a/main/lzo/asm/i386/src_gas/lzo1f_f2.S
+++ /dev/null
@@ -1,96 +0,0 @@
-/* lzo1f_f2.S -- lzo1f_decompress_asm_fast_safe
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-/***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-#include "asminit.def"
-#ifdef NAME1
-typef(NAME1(lzo1f_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-typef(NAME2(lzo1f_decompress_asm_fast_safe))
-#endif
-#ifdef NAME1
-globalf(NAME1(lzo1f_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-globalf(NAME2(lzo1f_decompress_asm_fast_safe))
-#endif
-#ifdef NAME1
-NAME1(lzo1f_decompress_asm_fast_safe):
-#endif
-#ifdef NAME2
-NAME2(lzo1f_decompress_asm_fast_safe):
-#endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0
-db 49,192,138,6,70,60,31,119,76,8,192,137,193,117,19,138
-db 6,70,8,192,117,8,129,193,255,0,0,0,235,241,141,76
-db 8,31,141,28,15,57,28,36,15,130,61,1,0,0,141,28
-db 14,57,92,36,4,15,130,41,1,0,0,136,200,193,233,2
-db 243,165,36,3,116,8,139,30,1,198,137,31,1,199,138,6
-db 70,60,31,118,110,60,223,15,135,179,0,0,0,137,193,193
-db 232,2,141,87,255,36,7,193,233,5,137,195,138,6,141,4
-db 195,70,41,194,131,193,2,135,214,59,116,36,48,15,130,239
-db 0,0,0,141,28,15,57,28,36,15,130,220,0,0,0,131
-db 249,6,114,16,131,248,4,114,11,136,200,193,233,2,243,165
-db 36,3,136,193,243,164,137,214,138,78,254,131,225,3,15,132
-db 76,255,255,255,139,6,1,206,137,7,1,207,49,192,138,6
-db 70,235,142,141,87,3,57,20,36,15,130,156,0,0,0,193
-db 232,2,141,151,255,247,255,255,137,193,138,6,70,141,4,193
-db 41,194,59,84,36,48,15,130,134,0,0,0,139,2,137,7
-db 131,199,3,235,179,138,6,70,8,192,117,8,129,193,255,0
-db 0,0,235,241,141,76,8,31,235,12,141,182,0,0,0,0
-db 36,31,137,193,116,223,137,250,102,139,6,131,198,2,193,232
-db 2,15,133,75,255,255,255,131,249,1,15,149,192,59,60,36
-db 119,57,139,84,36,40,3,84,36,44,57,214,119,38,114,29
-db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90
-db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0
-db 0,0,235,220,184,4,0,0,0,235,213,184,5,0,0,0
-db 235,206,184,6,0,0,0,235,199,141,180,38,0,0,0,0
-#ifdef NAME1
-sizef(NAME1(lzo1f_decompress_asm_fast_safe),.-NAME1(lzo1f_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-sizef(NAME2(lzo1f_decompress_asm_fast_safe),.-NAME2(lzo1f_decompress_asm_fast_safe))
-#endif
diff --git a/main/lzo/asm/i386/src_gas/lzo1x_f1.S b/main/lzo/asm/i386/src_gas/lzo1x_f1.S
index 8e2bcc9e..9ca92c34 100644
--- a/main/lzo/asm/i386/src_gas/lzo1x_f1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1x_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_gas/lzo1x_f2.S b/main/lzo/asm/i386/src_gas/lzo1x_f2.S
deleted file mode 100644
index 0ded30ee..00000000
--- a/main/lzo/asm/i386/src_gas/lzo1x_f2.S
+++ /dev/null
@@ -1,112 +0,0 @@
-/* lzo1x_f2.S -- lzo1x_decompress_asm_fast_safe
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-/***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-#include "asminit.def"
-#ifdef NAME1
-typef(NAME1(lzo1x_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-typef(NAME2(lzo1x_decompress_asm_fast_safe))
-#endif
-#ifdef NAME1
-globalf(NAME1(lzo1x_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-globalf(NAME2(lzo1x_decompress_asm_fast_safe))
-#endif
-#ifdef NAME1
-NAME1(lzo1x_decompress_asm_fast_safe):
-#endif
-#ifdef NAME2
-NAME2(lzo1x_decompress_asm_fast_safe):
-#endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,55,44,14,235,62,5,255,0,0,0,141
-db 84,6,18,57,84,36,4,15,130,78,2,0,0,138,30,70
-db 8,219,116,230,141,68,24,21,235,30,141,182,0,0,0,0
-db 57,116,36,4,15,130,49,2,0,0,138,6,70,60,16,115
-db 119,8,192,116,216,131,192,6,141,84,7,253,57,20,36,15
-db 130,29,2,0,0,141,84,6,253,57,84,36,4,15,130,8
-db 2,0,0,137,193,49,232,193,233,2,33,232,139,22,131,198
-db 4,137,23,131,199,4,73,117,243,41,198,41,199,138,6,70
-db 60,16,115,52,141,87,3,57,20,36,15,130,226,1,0,0
-db 193,232,2,138,30,141,151,255,247,255,255,141,4,152,70,41
-db 194,59,84,36,48,15,130,206,1,0,0,139,10,137,15,1
-db 239,233,151,0,0,0,137,246,60,64,114,68,137,193,193,232
-db 2,141,87,255,131,224,7,138,30,193,233,5,141,4,216,70
-db 41,194,131,193,4,57,232,115,73,233,170,0,0,0,5,255
-db 0,0,0,141,86,3,57,84,36,4,15,130,123,1,0,0
-db 138,30,70,8,219,116,231,141,76,24,36,49,192,235,17,144
-db 60,32,15,130,200,0,0,0,131,224,31,116,227,141,72,5
-db 102,139,6,141,87,255,193,232,2,131,198,2,41,194,57,232
-db 114,102,59,84,36,48,15,130,77,1,0,0,141,68,15,253
-db 193,233,2,57,4,36,15,130,54,1,0,0,139,26,131,194
-db 4,137,31,131,199,4,73,117,243,137,199,49,219,138,70,254
-db 33,232,15,132,216,254,255,255,141,20,7,57,20,36,15,130
-db 14,1,0,0,141,20,6,57,84,36,4,15,130,250,0,0
-db 0,139,22,1,198,137,23,1,199,138,6,70,233,55,255,255
-db 255,141,180,38,0,0,0,0,59,84,36,48,15,130,231,0
-db 0,0,141,68,15,253,57,4,36,15,130,211,0,0,0,135
-db 214,41,233,243,164,137,214,235,164,129,193,255,0,0,0,141
-db 86,3,57,84,36,4,15,130,175,0,0,0,138,30,70,8
-db 219,116,230,141,76,11,12,235,27,141,180,38,0,0,0,0
-db 60,16,114,44,137,193,131,224,8,193,224,13,131,225,7,116
-db 219,131,193,5,102,139,6,131,198,2,141,151,0,192,255,255
-db 193,232,2,116,57,41,194,233,38,255,255,255,141,116,38,0
-db 141,87,2,57,20,36,114,106,193,232,2,138,30,141,87,255
-db 141,4,152,70,41,194,59,84,36,48,114,93,138,2,136,7
-db 138,90,1,136,95,1,131,199,2,233,31,255,255,255,131,249
-db 6,15,149,192,59,60,36,119,57,139,84,36,40,3,84,36
-db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137
-db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0
-db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0
-db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199
-#ifdef NAME1
-sizef(NAME1(lzo1x_decompress_asm_fast_safe),.-NAME1(lzo1x_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-sizef(NAME2(lzo1x_decompress_asm_fast_safe),.-NAME2(lzo1x_decompress_asm_fast_safe))
-#endif
diff --git a/main/lzo/asm/i386/src_gas/lzo1x_s1.S b/main/lzo/asm/i386/src_gas/lzo1x_s1.S
index ed43092b..3e31c182 100644
--- a/main/lzo/asm/i386/src_gas/lzo1x_s1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1x_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_gas/lzo1x_s2.S b/main/lzo/asm/i386/src_gas/lzo1x_s2.S
deleted file mode 100644
index 46d60aa0..00000000
--- a/main/lzo/asm/i386/src_gas/lzo1x_s2.S
+++ /dev/null
@@ -1,115 +0,0 @@
-/* lzo1x_s2.S -- lzo1x_decompress_asm_safe
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-/***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-#include "asminit.def"
-#ifdef NAME1
-typef(NAME1(lzo1x_decompress_asm_safe))
-#endif
-#ifdef NAME2
-typef(NAME2(lzo1x_decompress_asm_safe))
-#endif
-#ifdef NAME1
-globalf(NAME1(lzo1x_decompress_asm_safe))
-#endif
-#ifdef NAME2
-globalf(NAME2(lzo1x_decompress_asm_safe))
-#endif
-#ifdef NAME1
-NAME1(lzo1x_decompress_asm_safe):
-#endif
-#ifdef NAME2
-NAME2(lzo1x_decompress_asm_safe):
-#endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,87,44,17,60,4,115,92,141,20,7,57
-db 20,36,15,130,130,2,0,0,141,20,6,57,84,36,4,15
-db 130,110,2,0,0,137,193,235,110,5,255,0,0,0,141,84
-db 6,18,57,84,36,4,15,130,87,2,0,0,138,30,70,8
-db 219,116,230,141,68,24,18,235,31,141,180,38,0,0,0,0
-db 57,116,36,4,15,130,57,2,0,0,138,6,70,60,16,115
-db 127,8,192,116,215,131,192,3,141,84,7,0,57,20,36,15
-db 130,37,2,0,0,141,84,6,0,57,84,36,4,15,130,16
-db 2,0,0,137,193,193,232,2,33,233,139,22,131,198,4,137
-db 23,131,199,4,72,117,243,243,164,138,6,70,60,16,115,64
-db 141,87,3,57,20,36,15,130,238,1,0,0,193,232,2,138
-db 30,141,151,255,247,255,255,141,4,152,70,41,194,59,84,36
-db 48,15,130,218,1,0,0,138,2,136,7,138,66,1,136,71
-db 1,138,66,2,136,71,2,1,239,233,163,0,0,0,137,246
-db 60,64,114,68,137,193,193,232,2,141,87,255,131,224,7,138
-db 30,193,233,5,141,4,216,70,41,194,65,57,232,115,75,233
-db 180,0,0,0,5,255,0,0,0,141,86,3,57,84,36,4
-db 15,130,125,1,0,0,138,30,70,8,219,116,231,141,76,24
-db 33,49,192,235,19,141,118,0,60,32,15,130,200,0,0,0
-db 131,224,31,116,225,141,72,2,102,139,6,141,87,255,193,232
-db 2,131,198,2,41,194,57,232,114,110,59,84,36,48,15,130
-db 77,1,0,0,141,4,15,57,4,36,15,130,58,1,0,0
-db 137,203,193,235,2,116,17,139,2,131,194,4,137,7,131,199
-db 4,75,117,243,33,233,116,9,138,2,66,136,7,71,73,117
-db 247,138,70,254,33,232,15,132,196,254,255,255,141,20,7,57
-db 20,36,15,130,2,1,0,0,141,20,6,57,84,36,4,15
-db 130,238,0,0,0,138,14,70,136,15,71,72,117,247,138,6
-db 70,233,42,255,255,255,137,246,59,84,36,48,15,130,223,0
-db 0,0,141,68,15,0,57,4,36,15,130,203,0,0,0,135
-db 214,243,164,137,214,235,170,129,193,255,0,0,0,141,86,3
-db 57,84,36,4,15,130,169,0,0,0,138,30,70,8,219,116
-db 230,141,76,11,9,235,21,144,60,16,114,44,137,193,131,224
-db 8,193,224,13,131,225,7,116,225,131,193,2,102,139,6,131
-db 198,2,141,151,0,192,255,255,193,232,2,116,57,41,194,233
-db 38,255,255,255,141,116,38,0,141,87,2,57,20,36,114,106
-db 193,232,2,138,30,141,87,255,141,4,152,70,41,194,59,84
-db 36,48,114,93,138,2,136,7,138,90,1,136,95,1,131,199
-db 2,233,43,255,255,255,131,249,3,15,149,192,59,60,36,119
-db 57,139,84,36,40,3,84,36,44,57,214,119,38,114,29,43
-db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89
-db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0
-db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235
-db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0
-#ifdef NAME1
-sizef(NAME1(lzo1x_decompress_asm_safe),.-NAME1(lzo1x_decompress_asm_safe))
-#endif
-#ifdef NAME2
-sizef(NAME2(lzo1x_decompress_asm_safe),.-NAME2(lzo1x_decompress_asm_safe))
-#endif
diff --git a/main/lzo/asm/i386/src_gas/lzo1y_f1.S b/main/lzo/asm/i386/src_gas/lzo1y_f1.S
index 32ee007a..b3129c39 100644
--- a/main/lzo/asm/i386/src_gas/lzo1y_f1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1y_f1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_gas/lzo1y_f2.S b/main/lzo/asm/i386/src_gas/lzo1y_f2.S
deleted file mode 100644
index de28ace9..00000000
--- a/main/lzo/asm/i386/src_gas/lzo1y_f2.S
+++ /dev/null
@@ -1,112 +0,0 @@
-/* lzo1y_f2.S -- lzo1y_decompress_asm_fast_safe
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-/***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-#include "asminit.def"
-#ifdef NAME1
-typef(NAME1(lzo1y_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-typef(NAME2(lzo1y_decompress_asm_fast_safe))
-#endif
-#ifdef NAME1
-globalf(NAME1(lzo1y_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-globalf(NAME2(lzo1y_decompress_asm_fast_safe))
-#endif
-#ifdef NAME1
-NAME1(lzo1y_decompress_asm_fast_safe):
-#endif
-#ifdef NAME2
-NAME2(lzo1y_decompress_asm_fast_safe):
-#endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,55,44,14,235,62,5,255,0,0,0,141
-db 84,6,18,57,84,36,4,15,130,78,2,0,0,138,30,70
-db 8,219,116,230,141,68,24,21,235,30,141,182,0,0,0,0
-db 57,116,36,4,15,130,49,2,0,0,138,6,70,60,16,115
-db 119,8,192,116,216,131,192,6,141,84,7,253,57,20,36,15
-db 130,29,2,0,0,141,84,6,253,57,84,36,4,15,130,8
-db 2,0,0,137,193,49,232,193,233,2,33,232,139,22,131,198
-db 4,137,23,131,199,4,73,117,243,41,198,41,199,138,6,70
-db 60,16,115,52,141,87,3,57,20,36,15,130,226,1,0,0
-db 193,232,2,138,30,141,151,255,251,255,255,141,4,152,70,41
-db 194,59,84,36,48,15,130,206,1,0,0,139,10,137,15,1
-db 239,233,151,0,0,0,137,246,60,64,114,68,137,193,193,232
-db 2,141,87,255,33,232,138,30,193,233,4,141,4,152,70,41
-db 194,131,193,2,57,232,115,74,233,171,0,0,0,5,255,0
-db 0,0,141,86,3,57,84,36,4,15,130,124,1,0,0,138
-db 30,70,8,219,116,231,141,76,24,36,49,192,235,18,137,246
-db 60,32,15,130,200,0,0,0,131,224,31,116,226,141,72,5
-db 102,139,6,141,87,255,193,232,2,131,198,2,41,194,57,232
-db 114,102,59,84,36,48,15,130,77,1,0,0,141,68,15,253
-db 193,233,2,57,4,36,15,130,54,1,0,0,139,26,131,194
-db 4,137,31,131,199,4,73,117,243,137,199,49,219,138,70,254
-db 33,232,15,132,216,254,255,255,141,20,7,57,20,36,15,130
-db 14,1,0,0,141,20,6,57,84,36,4,15,130,250,0,0
-db 0,139,22,1,198,137,23,1,199,138,6,70,233,55,255,255
-db 255,141,180,38,0,0,0,0,59,84,36,48,15,130,231,0
-db 0,0,141,68,15,253,57,4,36,15,130,211,0,0,0,135
-db 214,41,233,243,164,137,214,235,164,129,193,255,0,0,0,141
-db 86,3,57,84,36,4,15,130,175,0,0,0,138,30,70,8
-db 219,116,230,141,76,11,12,235,27,141,180,38,0,0,0,0
-db 60,16,114,44,137,193,131,224,8,193,224,13,131,225,7,116
-db 219,131,193,5,102,139,6,131,198,2,141,151,0,192,255,255
-db 193,232,2,116,57,41,194,233,38,255,255,255,141,116,38,0
-db 141,87,2,57,20,36,114,106,193,232,2,138,30,141,87,255
-db 141,4,152,70,41,194,59,84,36,48,114,93,138,2,136,7
-db 138,90,1,136,95,1,131,199,2,233,31,255,255,255,131,249
-db 6,15,149,192,59,60,36,119,57,139,84,36,40,3,84,36
-db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137
-db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0
-db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0
-db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199
-#ifdef NAME1
-sizef(NAME1(lzo1y_decompress_asm_fast_safe),.-NAME1(lzo1y_decompress_asm_fast_safe))
-#endif
-#ifdef NAME2
-sizef(NAME2(lzo1y_decompress_asm_fast_safe),.-NAME2(lzo1y_decompress_asm_fast_safe))
-#endif
diff --git a/main/lzo/asm/i386/src_gas/lzo1y_s1.S b/main/lzo/asm/i386/src_gas/lzo1y_s1.S
index 6a52bbbc..c67db49d 100644
--- a/main/lzo/asm/i386/src_gas/lzo1y_s1.S
+++ b/main/lzo/asm/i386/src_gas/lzo1y_s1.S
@@ -2,7 +2,7 @@
 
    This file is part of the LZO real-time data compression library.
 
-   Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+   Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
    All Rights Reserved.
 
    The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_gas/lzo1y_s2.S b/main/lzo/asm/i386/src_gas/lzo1y_s2.S
deleted file mode 100644
index 4da81a3c..00000000
--- a/main/lzo/asm/i386/src_gas/lzo1y_s2.S
+++ /dev/null
@@ -1,115 +0,0 @@
-/* lzo1y_s2.S -- lzo1y_decompress_asm_safe
-
-   This file is part of the LZO real-time data compression library.
-
-   Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-   Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-   All Rights Reserved.
-
-   The LZO library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   The LZO library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with the LZO library; see the file COPYING.
-   If not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-   Markus F.X.J. Oberhumer
-   <markus@oberhumer.com>
-   http://www.oberhumer.com/opensource/lzo/
- */
-
-/***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-#include "asminit.def"
-#ifdef NAME1
-typef(NAME1(lzo1y_decompress_asm_safe))
-#endif
-#ifdef NAME2
-typef(NAME2(lzo1y_decompress_asm_safe))
-#endif
-#ifdef NAME1
-globalf(NAME1(lzo1y_decompress_asm_safe))
-#endif
-#ifdef NAME2
-globalf(NAME2(lzo1y_decompress_asm_safe))
-#endif
-#ifdef NAME1
-NAME1(lzo1y_decompress_asm_safe):
-#endif
-#ifdef NAME2
-NAME2(lzo1y_decompress_asm_safe):
-#endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,87,44,17,60,4,115,92,141,20,7,57
-db 20,36,15,130,130,2,0,0,141,20,6,57,84,36,4,15
-db 130,110,2,0,0,137,193,235,110,5,255,0,0,0,141,84
-db 6,18,57,84,36,4,15,130,87,2,0,0,138,30,70,8
-db 219,116,230,141,68,24,18,235,31,141,180,38,0,0,0,0
-db 57,116,36,4,15,130,57,2,0,0,138,6,70,60,16,115
-db 127,8,192,116,215,131,192,3,141,84,7,0,57,20,36,15
-db 130,37,2,0,0,141,84,6,0,57,84,36,4,15,130,16
-db 2,0,0,137,193,193,232,2,33,233,139,22,131,198,4,137
-db 23,131,199,4,72,117,243,243,164,138,6,70,60,16,115,64
-db 141,87,3,57,20,36,15,130,238,1,0,0,193,232,2,138
-db 30,141,151,255,251,255,255,141,4,152,70,41,194,59,84,36
-db 48,15,130,218,1,0,0,138,2,136,7,138,66,1,136,71
-db 1,138,66,2,136,71,2,1,239,233,163,0,0,0,137,246
-db 60,64,114,68,137,193,193,232,2,141,87,255,33,232,138,30
-db 193,233,4,141,4,152,70,41,194,73,57,232,115,76,233,181
-db 0,0,0,5,255,0,0,0,141,86,3,57,84,36,4,15
-db 130,126,1,0,0,138,30,70,8,219,116,231,141,76,24,33
-db 49,192,235,20,141,116,38,0,60,32,15,130,200,0,0,0
-db 131,224,31,116,224,141,72,2,102,139,6,141,87,255,193,232
-db 2,131,198,2,41,194,57,232,114,110,59,84,36,48,15,130
-db 77,1,0,0,141,4,15,57,4,36,15,130,58,1,0,0
-db 137,203,193,235,2,116,17,139,2,131,194,4,137,7,131,199
-db 4,75,117,243,33,233,116,9,138,2,66,136,7,71,73,117
-db 247,138,70,254,33,232,15,132,196,254,255,255,141,20,7,57
-db 20,36,15,130,2,1,0,0,141,20,6,57,84,36,4,15
-db 130,238,0,0,0,138,14,70,136,15,71,72,117,247,138,6
-db 70,233,42,255,255,255,137,246,59,84,36,48,15,130,223,0
-db 0,0,141,68,15,0,57,4,36,15,130,203,0,0,0,135
-db 214,243,164,137,214,235,170,129,193,255,0,0,0,141,86,3
-db 57,84,36,4,15,130,169,0,0,0,138,30,70,8,219,116
-db 230,141,76,11,9,235,21,144,60,16,114,44,137,193,131,224
-db 8,193,224,13,131,225,7,116,225,131,193,2,102,139,6,131
-db 198,2,141,151,0,192,255,255,193,232,2,116,57,41,194,233
-db 38,255,255,255,141,116,38,0,141,87,2,57,20,36,114,106
-db 193,232,2,138,30,141,87,255,141,4,152,70,41,194,59,84
-db 36,48,114,93,138,2,136,7,138,90,1,136,95,1,131,199
-db 2,233,43,255,255,255,131,249,3,15,149,192,59,60,36,119
-db 57,139,84,36,40,3,84,36,44,57,214,119,38,114,29,43
-db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89
-db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0
-db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235
-db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0
-#ifdef NAME1
-sizef(NAME1(lzo1y_decompress_asm_safe),.-NAME1(lzo1y_decompress_asm_safe))
-#endif
-#ifdef NAME2
-sizef(NAME2(lzo1y_decompress_asm_safe),.-NAME2(lzo1y_decompress_asm_safe))
-#endif
diff --git a/main/lzo/asm/i386/src_masm/all/asm_all.asm b/main/lzo/asm/i386/src_masm/all/asm_all.asm
index bda48d44..58ae4708 100644
--- a/main/lzo/asm/i386/src_masm/all/asm_all.asm
+++ b/main/lzo/asm/i386/src_masm/all/asm_all.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/asminit.def b/main/lzo/asm/i386/src_masm/asminit.def
index 749eb9b5..5754d787 100644
--- a/main/lzo/asm/i386/src_masm/asminit.def
+++ b/main/lzo/asm/i386/src_masm/asminit.def
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/lzo1c_s1.asm b/main/lzo/asm/i386/src_masm/lzo1c_s1.asm
index f9418df3..67016e35 100644
--- a/main/lzo/asm/i386/src_masm/lzo1c_s1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1c_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/lzo1c_s2.asm b/main/lzo/asm/i386/src_masm/lzo1c_s2.asm
deleted file mode 100644
index 08dfb401..00000000
--- a/main/lzo/asm/i386/src_masm/lzo1c_s2.asm
+++ /dev/null
@@ -1,77 +0,0 @@
-;  lzo1c_s2.asm -- lzo1c_decompress_asm_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-include asminit.def
-public _lzo1c_decompress_asm_safe
-_lzo1c_decompress_asm_safe:
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0
-db 49,192,138,6,70,60,32,115,40,8,192,116,99,137,193,141
-db 28,15,57,28,36,15,130,107,1,0,0,141,28,14,57,92
-db 36,4,15,130,87,1,0,0,243,164,138,6,70,60,32,114
-db 127,60,64,15,130,169,0,0,0,137,193,36,31,141,87,255
-db 193,233,5,41,194,138,6,70,193,224,5,41,194,65,135,242
-db 59,116,36,48,15,130,51,1,0,0,141,28,15,57,28,36
-db 15,130,32,1,0,0,243,164,137,214,235,148,141,116,38,0
-db 138,6,70,141,72,32,60,248,114,149,185,24,1,0,0,44
-db 248,116,6,145,48,192,211,224,145,141,28,15,57,28,36,15
-db 130,241,0,0,0,141,28,14,57,92,36,4,15,130,221,0
-db 0,0,243,164,233,87,255,255,255,141,180,38,0,0,0,0
-db 141,87,255,41,194,138,6,70,193,224,5,41,194,135,242,59
-db 116,36,48,15,130,196,0,0,0,141,95,4,57,28,36,15
-db 130,177,0,0,0,164,164,164,137,214,164,49,192,233,72,255
-db 255,255,36,31,137,193,117,26,177,31,138,6,70,8,192,117
-db 15,129,193,255,0,0,0,235,241,141,180,38,0,0,0,0
-db 1,193,138,6,70,137,195,36,63,137,250,41,194,138,6,70
-db 193,224,6,41,194,57,250,116,41,135,214,141,73,3,59,116
-db 36,48,114,105,141,4,15,57,4,36,114,90,243,164,137,214
-db 49,192,193,235,6,137,217,15,133,210,254,255,255,233,190,254
-db 255,255,131,249,1,15,149,192,59,60,36,119,57,139,84,36
-db 40,3,84,36,44,57,214,119,38,114,29,43,124,36,48,139
-db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93
-db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184
-db 4,0,0,0,235,213,184,5,0,0,0,235,206,184,6,0
-db 0,0,235,199,141,182,0,0,0,0,141,191,0,0,0,0
-end
diff --git a/main/lzo/asm/i386/src_masm/lzo1f_f1.asm b/main/lzo/asm/i386/src_masm/lzo1f_f1.asm
index ec51f0ba..f1252af9 100644
--- a/main/lzo/asm/i386/src_masm/lzo1f_f1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1f_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/lzo1f_f2.asm b/main/lzo/asm/i386/src_masm/lzo1f_f2.asm
deleted file mode 100644
index 7ec00573..00000000
--- a/main/lzo/asm/i386/src_masm/lzo1f_f2.asm
+++ /dev/null
@@ -1,75 +0,0 @@
-;  lzo1f_f2.asm -- lzo1f_decompress_asm_fast_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-include asminit.def
-public _lzo1f_decompress_asm_fast_safe
-_lzo1f_decompress_asm_fast_safe:
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0
-db 49,192,138,6,70,60,31,119,76,8,192,137,193,117,19,138
-db 6,70,8,192,117,8,129,193,255,0,0,0,235,241,141,76
-db 8,31,141,28,15,57,28,36,15,130,61,1,0,0,141,28
-db 14,57,92,36,4,15,130,41,1,0,0,136,200,193,233,2
-db 243,165,36,3,116,8,139,30,1,198,137,31,1,199,138,6
-db 70,60,31,118,110,60,223,15,135,179,0,0,0,137,193,193
-db 232,2,141,87,255,36,7,193,233,5,137,195,138,6,141,4
-db 195,70,41,194,131,193,2,135,214,59,116,36,48,15,130,239
-db 0,0,0,141,28,15,57,28,36,15,130,220,0,0,0,131
-db 249,6,114,16,131,248,4,114,11,136,200,193,233,2,243,165
-db 36,3,136,193,243,164,137,214,138,78,254,131,225,3,15,132
-db 76,255,255,255,139,6,1,206,137,7,1,207,49,192,138,6
-db 70,235,142,141,87,3,57,20,36,15,130,156,0,0,0,193
-db 232,2,141,151,255,247,255,255,137,193,138,6,70,141,4,193
-db 41,194,59,84,36,48,15,130,134,0,0,0,139,2,137,7
-db 131,199,3,235,179,138,6,70,8,192,117,8,129,193,255,0
-db 0,0,235,241,141,76,8,31,235,12,141,182,0,0,0,0
-db 36,31,137,193,116,223,137,250,102,139,6,131,198,2,193,232
-db 2,15,133,75,255,255,255,131,249,1,15,149,192,59,60,36
-db 119,57,139,84,36,40,3,84,36,44,57,214,119,38,114,29
-db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90
-db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0
-db 0,0,235,220,184,4,0,0,0,235,213,184,5,0,0,0
-db 235,206,184,6,0,0,0,235,199,141,180,38,0,0,0,0
-end
diff --git a/main/lzo/asm/i386/src_masm/lzo1x_f1.asm b/main/lzo/asm/i386/src_masm/lzo1x_f1.asm
index efe2f040..95feaa21 100644
--- a/main/lzo/asm/i386/src_masm/lzo1x_f1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1x_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/lzo1x_f2.asm b/main/lzo/asm/i386/src_masm/lzo1x_f2.asm
deleted file mode 100644
index 5994e2de..00000000
--- a/main/lzo/asm/i386/src_masm/lzo1x_f2.asm
+++ /dev/null
@@ -1,91 +0,0 @@
-;  lzo1x_f2.asm -- lzo1x_decompress_asm_fast_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-include asminit.def
-public _lzo1x_decompress_asm_fast_safe
-_lzo1x_decompress_asm_fast_safe:
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,55,44,14,235,62,5,255,0,0,0,141
-db 84,6,18,57,84,36,4,15,130,78,2,0,0,138,30,70
-db 8,219,116,230,141,68,24,21,235,30,141,182,0,0,0,0
-db 57,116,36,4,15,130,49,2,0,0,138,6,70,60,16,115
-db 119,8,192,116,216,131,192,6,141,84,7,253,57,20,36,15
-db 130,29,2,0,0,141,84,6,253,57,84,36,4,15,130,8
-db 2,0,0,137,193,49,232,193,233,2,33,232,139,22,131,198
-db 4,137,23,131,199,4,73,117,243,41,198,41,199,138,6,70
-db 60,16,115,52,141,87,3,57,20,36,15,130,226,1,0,0
-db 193,232,2,138,30,141,151,255,247,255,255,141,4,152,70,41
-db 194,59,84,36,48,15,130,206,1,0,0,139,10,137,15,1
-db 239,233,151,0,0,0,137,246,60,64,114,68,137,193,193,232
-db 2,141,87,255,131,224,7,138,30,193,233,5,141,4,216,70
-db 41,194,131,193,4,57,232,115,73,233,170,0,0,0,5,255
-db 0,0,0,141,86,3,57,84,36,4,15,130,123,1,0,0
-db 138,30,70,8,219,116,231,141,76,24,36,49,192,235,17,144
-db 60,32,15,130,200,0,0,0,131,224,31,116,227,141,72,5
-db 102,139,6,141,87,255,193,232,2,131,198,2,41,194,57,232
-db 114,102,59,84,36,48,15,130,77,1,0,0,141,68,15,253
-db 193,233,2,57,4,36,15,130,54,1,0,0,139,26,131,194
-db 4,137,31,131,199,4,73,117,243,137,199,49,219,138,70,254
-db 33,232,15,132,216,254,255,255,141,20,7,57,20,36,15,130
-db 14,1,0,0,141,20,6,57,84,36,4,15,130,250,0,0
-db 0,139,22,1,198,137,23,1,199,138,6,70,233,55,255,255
-db 255,141,180,38,0,0,0,0,59,84,36,48,15,130,231,0
-db 0,0,141,68,15,253,57,4,36,15,130,211,0,0,0,135
-db 214,41,233,243,164,137,214,235,164,129,193,255,0,0,0,141
-db 86,3,57,84,36,4,15,130,175,0,0,0,138,30,70,8
-db 219,116,230,141,76,11,12,235,27,141,180,38,0,0,0,0
-db 60,16,114,44,137,193,131,224,8,193,224,13,131,225,7,116
-db 219,131,193,5,102,139,6,131,198,2,141,151,0,192,255,255
-db 193,232,2,116,57,41,194,233,38,255,255,255,141,116,38,0
-db 141,87,2,57,20,36,114,106,193,232,2,138,30,141,87,255
-db 141,4,152,70,41,194,59,84,36,48,114,93,138,2,136,7
-db 138,90,1,136,95,1,131,199,2,233,31,255,255,255,131,249
-db 6,15,149,192,59,60,36,119,57,139,84,36,40,3,84,36
-db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137
-db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0
-db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0
-db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199
-end
diff --git a/main/lzo/asm/i386/src_masm/lzo1x_s1.asm b/main/lzo/asm/i386/src_masm/lzo1x_s1.asm
index 1c31acc5..4af988a3 100644
--- a/main/lzo/asm/i386/src_masm/lzo1x_s1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1x_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/lzo1x_s2.asm b/main/lzo/asm/i386/src_masm/lzo1x_s2.asm
deleted file mode 100644
index 7316e55b..00000000
--- a/main/lzo/asm/i386/src_masm/lzo1x_s2.asm
+++ /dev/null
@@ -1,94 +0,0 @@
-;  lzo1x_s2.asm -- lzo1x_decompress_asm_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-include asminit.def
-public _lzo1x_decompress_asm_safe
-_lzo1x_decompress_asm_safe:
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,87,44,17,60,4,115,92,141,20,7,57
-db 20,36,15,130,130,2,0,0,141,20,6,57,84,36,4,15
-db 130,110,2,0,0,137,193,235,110,5,255,0,0,0,141,84
-db 6,18,57,84,36,4,15,130,87,2,0,0,138,30,70,8
-db 219,116,230,141,68,24,18,235,31,141,180,38,0,0,0,0
-db 57,116,36,4,15,130,57,2,0,0,138,6,70,60,16,115
-db 127,8,192,116,215,131,192,3,141,84,7,0,57,20,36,15
-db 130,37,2,0,0,141,84,6,0,57,84,36,4,15,130,16
-db 2,0,0,137,193,193,232,2,33,233,139,22,131,198,4,137
-db 23,131,199,4,72,117,243,243,164,138,6,70,60,16,115,64
-db 141,87,3,57,20,36,15,130,238,1,0,0,193,232,2,138
-db 30,141,151,255,247,255,255,141,4,152,70,41,194,59,84,36
-db 48,15,130,218,1,0,0,138,2,136,7,138,66,1,136,71
-db 1,138,66,2,136,71,2,1,239,233,163,0,0,0,137,246
-db 60,64,114,68,137,193,193,232,2,141,87,255,131,224,7,138
-db 30,193,233,5,141,4,216,70,41,194,65,57,232,115,75,233
-db 180,0,0,0,5,255,0,0,0,141,86,3,57,84,36,4
-db 15,130,125,1,0,0,138,30,70,8,219,116,231,141,76,24
-db 33,49,192,235,19,141,118,0,60,32,15,130,200,0,0,0
-db 131,224,31,116,225,141,72,2,102,139,6,141,87,255,193,232
-db 2,131,198,2,41,194,57,232,114,110,59,84,36,48,15,130
-db 77,1,0,0,141,4,15,57,4,36,15,130,58,1,0,0
-db 137,203,193,235,2,116,17,139,2,131,194,4,137,7,131,199
-db 4,75,117,243,33,233,116,9,138,2,66,136,7,71,73,117
-db 247,138,70,254,33,232,15,132,196,254,255,255,141,20,7,57
-db 20,36,15,130,2,1,0,0,141,20,6,57,84,36,4,15
-db 130,238,0,0,0,138,14,70,136,15,71,72,117,247,138,6
-db 70,233,42,255,255,255,137,246,59,84,36,48,15,130,223,0
-db 0,0,141,68,15,0,57,4,36,15,130,203,0,0,0,135
-db 214,243,164,137,214,235,170,129,193,255,0,0,0,141,86,3
-db 57,84,36,4,15,130,169,0,0,0,138,30,70,8,219,116
-db 230,141,76,11,9,235,21,144,60,16,114,44,137,193,131,224
-db 8,193,224,13,131,225,7,116,225,131,193,2,102,139,6,131
-db 198,2,141,151,0,192,255,255,193,232,2,116,57,41,194,233
-db 38,255,255,255,141,116,38,0,141,87,2,57,20,36,114,106
-db 193,232,2,138,30,141,87,255,141,4,152,70,41,194,59,84
-db 36,48,114,93,138,2,136,7,138,90,1,136,95,1,131,199
-db 2,233,43,255,255,255,131,249,3,15,149,192,59,60,36,119
-db 57,139,84,36,40,3,84,36,44,57,214,119,38,114,29,43
-db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89
-db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0
-db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235
-db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0
-end
diff --git a/main/lzo/asm/i386/src_masm/lzo1y_f1.asm b/main/lzo/asm/i386/src_masm/lzo1y_f1.asm
index f111ccb5..d86112ac 100644
--- a/main/lzo/asm/i386/src_masm/lzo1y_f1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1y_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/lzo1y_f2.asm b/main/lzo/asm/i386/src_masm/lzo1y_f2.asm
deleted file mode 100644
index daf67e5a..00000000
--- a/main/lzo/asm/i386/src_masm/lzo1y_f2.asm
+++ /dev/null
@@ -1,91 +0,0 @@
-;  lzo1y_f2.asm -- lzo1y_decompress_asm_fast_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-include asminit.def
-public _lzo1y_decompress_asm_fast_safe
-_lzo1y_decompress_asm_fast_safe:
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,55,44,14,235,62,5,255,0,0,0,141
-db 84,6,18,57,84,36,4,15,130,78,2,0,0,138,30,70
-db 8,219,116,230,141,68,24,21,235,30,141,182,0,0,0,0
-db 57,116,36,4,15,130,49,2,0,0,138,6,70,60,16,115
-db 119,8,192,116,216,131,192,6,141,84,7,253,57,20,36,15
-db 130,29,2,0,0,141,84,6,253,57,84,36,4,15,130,8
-db 2,0,0,137,193,49,232,193,233,2,33,232,139,22,131,198
-db 4,137,23,131,199,4,73,117,243,41,198,41,199,138,6,70
-db 60,16,115,52,141,87,3,57,20,36,15,130,226,1,0,0
-db 193,232,2,138,30,141,151,255,251,255,255,141,4,152,70,41
-db 194,59,84,36,48,15,130,206,1,0,0,139,10,137,15,1
-db 239,233,151,0,0,0,137,246,60,64,114,68,137,193,193,232
-db 2,141,87,255,33,232,138,30,193,233,4,141,4,152,70,41
-db 194,131,193,2,57,232,115,74,233,171,0,0,0,5,255,0
-db 0,0,141,86,3,57,84,36,4,15,130,124,1,0,0,138
-db 30,70,8,219,116,231,141,76,24,36,49,192,235,18,137,246
-db 60,32,15,130,200,0,0,0,131,224,31,116,226,141,72,5
-db 102,139,6,141,87,255,193,232,2,131,198,2,41,194,57,232
-db 114,102,59,84,36,48,15,130,77,1,0,0,141,68,15,253
-db 193,233,2,57,4,36,15,130,54,1,0,0,139,26,131,194
-db 4,137,31,131,199,4,73,117,243,137,199,49,219,138,70,254
-db 33,232,15,132,216,254,255,255,141,20,7,57,20,36,15,130
-db 14,1,0,0,141,20,6,57,84,36,4,15,130,250,0,0
-db 0,139,22,1,198,137,23,1,199,138,6,70,233,55,255,255
-db 255,141,180,38,0,0,0,0,59,84,36,48,15,130,231,0
-db 0,0,141,68,15,253,57,4,36,15,130,211,0,0,0,135
-db 214,41,233,243,164,137,214,235,164,129,193,255,0,0,0,141
-db 86,3,57,84,36,4,15,130,175,0,0,0,138,30,70,8
-db 219,116,230,141,76,11,12,235,27,141,180,38,0,0,0,0
-db 60,16,114,44,137,193,131,224,8,193,224,13,131,225,7,116
-db 219,131,193,5,102,139,6,131,198,2,141,151,0,192,255,255
-db 193,232,2,116,57,41,194,233,38,255,255,255,141,116,38,0
-db 141,87,2,57,20,36,114,106,193,232,2,138,30,141,87,255
-db 141,4,152,70,41,194,59,84,36,48,114,93,138,2,136,7
-db 138,90,1,136,95,1,131,199,2,233,31,255,255,255,131,249
-db 6,15,149,192,59,60,36,119,57,139,84,36,40,3,84,36
-db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137
-db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0
-db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0
-db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199
-end
diff --git a/main/lzo/asm/i386/src_masm/lzo1y_s1.asm b/main/lzo/asm/i386/src_masm/lzo1y_s1.asm
index c7779489..3c4ab481 100644
--- a/main/lzo/asm/i386/src_masm/lzo1y_s1.asm
+++ b/main/lzo/asm/i386/src_masm/lzo1y_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_masm/lzo1y_s2.asm b/main/lzo/asm/i386/src_masm/lzo1y_s2.asm
deleted file mode 100644
index c7ac80e2..00000000
--- a/main/lzo/asm/i386/src_masm/lzo1y_s2.asm
+++ /dev/null
@@ -1,94 +0,0 @@
-;  lzo1y_s2.asm -- lzo1y_decompress_asm_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-include asminit.def
-public _lzo1y_decompress_asm_safe
-_lzo1y_decompress_asm_safe:
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,87,44,17,60,4,115,92,141,20,7,57
-db 20,36,15,130,130,2,0,0,141,20,6,57,84,36,4,15
-db 130,110,2,0,0,137,193,235,110,5,255,0,0,0,141,84
-db 6,18,57,84,36,4,15,130,87,2,0,0,138,30,70,8
-db 219,116,230,141,68,24,18,235,31,141,180,38,0,0,0,0
-db 57,116,36,4,15,130,57,2,0,0,138,6,70,60,16,115
-db 127,8,192,116,215,131,192,3,141,84,7,0,57,20,36,15
-db 130,37,2,0,0,141,84,6,0,57,84,36,4,15,130,16
-db 2,0,0,137,193,193,232,2,33,233,139,22,131,198,4,137
-db 23,131,199,4,72,117,243,243,164,138,6,70,60,16,115,64
-db 141,87,3,57,20,36,15,130,238,1,0,0,193,232,2,138
-db 30,141,151,255,251,255,255,141,4,152,70,41,194,59,84,36
-db 48,15,130,218,1,0,0,138,2,136,7,138,66,1,136,71
-db 1,138,66,2,136,71,2,1,239,233,163,0,0,0,137,246
-db 60,64,114,68,137,193,193,232,2,141,87,255,33,232,138,30
-db 193,233,4,141,4,152,70,41,194,73,57,232,115,76,233,181
-db 0,0,0,5,255,0,0,0,141,86,3,57,84,36,4,15
-db 130,126,1,0,0,138,30,70,8,219,116,231,141,76,24,33
-db 49,192,235,20,141,116,38,0,60,32,15,130,200,0,0,0
-db 131,224,31,116,224,141,72,2,102,139,6,141,87,255,193,232
-db 2,131,198,2,41,194,57,232,114,110,59,84,36,48,15,130
-db 77,1,0,0,141,4,15,57,4,36,15,130,58,1,0,0
-db 137,203,193,235,2,116,17,139,2,131,194,4,137,7,131,199
-db 4,75,117,243,33,233,116,9,138,2,66,136,7,71,73,117
-db 247,138,70,254,33,232,15,132,196,254,255,255,141,20,7,57
-db 20,36,15,130,2,1,0,0,141,20,6,57,84,36,4,15
-db 130,238,0,0,0,138,14,70,136,15,71,72,117,247,138,6
-db 70,233,42,255,255,255,137,246,59,84,36,48,15,130,223,0
-db 0,0,141,68,15,0,57,4,36,15,130,203,0,0,0,135
-db 214,243,164,137,214,235,170,129,193,255,0,0,0,141,86,3
-db 57,84,36,4,15,130,169,0,0,0,138,30,70,8,219,116
-db 230,141,76,11,9,235,21,144,60,16,114,44,137,193,131,224
-db 8,193,224,13,131,225,7,116,225,131,193,2,102,139,6,131
-db 198,2,141,151,0,192,255,255,193,232,2,116,57,41,194,233
-db 38,255,255,255,141,116,38,0,141,87,2,57,20,36,114,106
-db 193,232,2,138,30,141,87,255,141,4,152,70,41,194,59,84
-db 36,48,114,93,138,2,136,7,138,90,1,136,95,1,131,199
-db 2,233,43,255,255,255,131,249,3,15,149,192,59,60,36,119
-db 57,139,84,36,40,3,84,36,44,57,214,119,38,114,29,43
-db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89
-db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0
-db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235
-db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0
-end
diff --git a/main/lzo/asm/i386/src_nasm/all/asm_all.asm b/main/lzo/asm/i386/src_nasm/all/asm_all.asm
index f453e626..87260c08 100644
--- a/main/lzo/asm/i386/src_nasm/all/asm_all.asm
+++ b/main/lzo/asm/i386/src_nasm/all/asm_all.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
@@ -50,10 +50,18 @@ bits 32
 %endif
 %endif
 %ifndef NAME1
-%ifidni __OUTPUT_FORMAT__,macho32
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,macho32
 %define NAME1(a)        _ %+ a
 %elifidni __OUTPUT_FORMAT__,macho64
 %define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a)             a
 %else
 %define NAME1(a)        _ %+ a
 %define NAME2(a)             a
diff --git a/main/lzo/asm/i386/src_nasm/asminit.def b/main/lzo/asm/i386/src_nasm/asminit.def
index 773cf997..db792afc 100644
--- a/main/lzo/asm/i386/src_nasm/asminit.def
+++ b/main/lzo/asm/i386/src_nasm/asminit.def
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
@@ -49,10 +49,18 @@ bits 32
 %endif
 
 %ifndef NAME1
-%ifidni __OUTPUT_FORMAT__,macho32
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a)             a
+%elifidni __OUTPUT_FORMAT__,macho32
 %define NAME1(a)        _ %+ a
 %elifidni __OUTPUT_FORMAT__,macho64
 %define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a)        _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a)             a
 %else
 %define NAME1(a)        _ %+ a
 %define NAME2(a)             a
diff --git a/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
index 982b4745..cb408e0d 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_nasm/lzo1c_s2.asm b/main/lzo/asm/i386/src_nasm/lzo1c_s2.asm
deleted file mode 100644
index 89fa7367..00000000
--- a/main/lzo/asm/i386/src_nasm/lzo1c_s2.asm
+++ /dev/null
@@ -1,92 +0,0 @@
-;  lzo1c_s2.asm -- lzo1c_decompress_asm_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-%include "asminit.def"
-%ifdef NAME1
-globalf(NAME1(lzo1c_decompress_asm_safe))
-%endif
-%ifdef NAME2
-globalf(NAME2(lzo1c_decompress_asm_safe))
-%endif
-%ifdef NAME1
-NAME1(lzo1c_decompress_asm_safe):
-%endif
-%ifdef NAME2
-NAME2(lzo1c_decompress_asm_safe):
-%endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0
-db 49,192,138,6,70,60,32,115,40,8,192,116,99,137,193,141
-db 28,15,57,28,36,15,130,107,1,0,0,141,28,14,57,92
-db 36,4,15,130,87,1,0,0,243,164,138,6,70,60,32,114
-db 127,60,64,15,130,169,0,0,0,137,193,36,31,141,87,255
-db 193,233,5,41,194,138,6,70,193,224,5,41,194,65,135,242
-db 59,116,36,48,15,130,51,1,0,0,141,28,15,57,28,36
-db 15,130,32,1,0,0,243,164,137,214,235,148,141,116,38,0
-db 138,6,70,141,72,32,60,248,114,149,185,24,1,0,0,44
-db 248,116,6,145,48,192,211,224,145,141,28,15,57,28,36,15
-db 130,241,0,0,0,141,28,14,57,92,36,4,15,130,221,0
-db 0,0,243,164,233,87,255,255,255,141,180,38,0,0,0,0
-db 141,87,255,41,194,138,6,70,193,224,5,41,194,135,242,59
-db 116,36,48,15,130,196,0,0,0,141,95,4,57,28,36,15
-db 130,177,0,0,0,164,164,164,137,214,164,49,192,233,72,255
-db 255,255,36,31,137,193,117,26,177,31,138,6,70,8,192,117
-db 15,129,193,255,0,0,0,235,241,141,180,38,0,0,0,0
-db 1,193,138,6,70,137,195,36,63,137,250,41,194,138,6,70
-db 193,224,6,41,194,57,250,116,41,135,214,141,73,3,59,116
-db 36,48,114,105,141,4,15,57,4,36,114,90,243,164,137,214
-db 49,192,193,235,6,137,217,15,133,210,254,255,255,233,190,254
-db 255,255,131,249,1,15,149,192,59,60,36,119,57,139,84,36
-db 40,3,84,36,44,57,214,119,38,114,29,43,124,36,48,139
-db 84,36,52,137,58,247,216,131,196,12,90,89,91,94,95,93
-db 195,184,1,0,0,0,235,227,184,8,0,0,0,235,220,184
-db 4,0,0,0,235,213,184,5,0,0,0,235,206,184,6,0
-db 0,0,235,199,141,182,0,0,0,0,141,191,0,0,0,0
-%ifdef NAME1
-globalf_end(NAME1(lzo1c_decompress_asm_safe))
-%endif
-%ifdef NAME2
-globalf_end(NAME2(lzo1c_decompress_asm_safe))
-%endif
diff --git a/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
index ccf37ed7..ebad1fd7 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_nasm/lzo1f_f2.asm b/main/lzo/asm/i386/src_nasm/lzo1f_f2.asm
deleted file mode 100644
index 70d6f36b..00000000
--- a/main/lzo/asm/i386/src_nasm/lzo1f_f2.asm
+++ /dev/null
@@ -1,90 +0,0 @@
-;  lzo1f_f2.asm -- lzo1f_decompress_asm_fast_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-%include "asminit.def"
-%ifdef NAME1
-globalf(NAME1(lzo1f_decompress_asm_fast_safe))
-%endif
-%ifdef NAME2
-globalf(NAME2(lzo1f_decompress_asm_fast_safe))
-%endif
-%ifdef NAME1
-NAME1(lzo1f_decompress_asm_fast_safe):
-%endif
-%ifdef NAME2
-NAME2(lzo1f_decompress_asm_fast_safe):
-%endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,141,118,0
-db 49,192,138,6,70,60,31,119,76,8,192,137,193,117,19,138
-db 6,70,8,192,117,8,129,193,255,0,0,0,235,241,141,76
-db 8,31,141,28,15,57,28,36,15,130,61,1,0,0,141,28
-db 14,57,92,36,4,15,130,41,1,0,0,136,200,193,233,2
-db 243,165,36,3,116,8,139,30,1,198,137,31,1,199,138,6
-db 70,60,31,118,110,60,223,15,135,179,0,0,0,137,193,193
-db 232,2,141,87,255,36,7,193,233,5,137,195,138,6,141,4
-db 195,70,41,194,131,193,2,135,214,59,116,36,48,15,130,239
-db 0,0,0,141,28,15,57,28,36,15,130,220,0,0,0,131
-db 249,6,114,16,131,248,4,114,11,136,200,193,233,2,243,165
-db 36,3,136,193,243,164,137,214,138,78,254,131,225,3,15,132
-db 76,255,255,255,139,6,1,206,137,7,1,207,49,192,138,6
-db 70,235,142,141,87,3,57,20,36,15,130,156,0,0,0,193
-db 232,2,141,151,255,247,255,255,137,193,138,6,70,141,4,193
-db 41,194,59,84,36,48,15,130,134,0,0,0,139,2,137,7
-db 131,199,3,235,179,138,6,70,8,192,117,8,129,193,255,0
-db 0,0,235,241,141,76,8,31,235,12,141,182,0,0,0,0
-db 36,31,137,193,116,223,137,250,102,139,6,131,198,2,193,232
-db 2,15,133,75,255,255,255,131,249,1,15,149,192,59,60,36
-db 119,57,139,84,36,40,3,84,36,44,57,214,119,38,114,29
-db 43,124,36,48,139,84,36,52,137,58,247,216,131,196,12,90
-db 89,91,94,95,93,195,184,1,0,0,0,235,227,184,8,0
-db 0,0,235,220,184,4,0,0,0,235,213,184,5,0,0,0
-db 235,206,184,6,0,0,0,235,199,141,180,38,0,0,0,0
-%ifdef NAME1
-globalf_end(NAME1(lzo1f_decompress_asm_fast_safe))
-%endif
-%ifdef NAME2
-globalf_end(NAME2(lzo1f_decompress_asm_fast_safe))
-%endif
diff --git a/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
index e269caa0..e5594740 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_nasm/lzo1x_f2.asm b/main/lzo/asm/i386/src_nasm/lzo1x_f2.asm
deleted file mode 100644
index ada1b886..00000000
--- a/main/lzo/asm/i386/src_nasm/lzo1x_f2.asm
+++ /dev/null
@@ -1,106 +0,0 @@
-;  lzo1x_f2.asm -- lzo1x_decompress_asm_fast_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-%include "asminit.def"
-%ifdef NAME1
-globalf(NAME1(lzo1x_decompress_asm_fast_safe))
-%endif
-%ifdef NAME2
-globalf(NAME2(lzo1x_decompress_asm_fast_safe))
-%endif
-%ifdef NAME1
-NAME1(lzo1x_decompress_asm_fast_safe):
-%endif
-%ifdef NAME2
-NAME2(lzo1x_decompress_asm_fast_safe):
-%endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,55,44,14,235,62,5,255,0,0,0,141
-db 84,6,18,57,84,36,4,15,130,78,2,0,0,138,30,70
-db 8,219,116,230,141,68,24,21,235,30,141,182,0,0,0,0
-db 57,116,36,4,15,130,49,2,0,0,138,6,70,60,16,115
-db 119,8,192,116,216,131,192,6,141,84,7,253,57,20,36,15
-db 130,29,2,0,0,141,84,6,253,57,84,36,4,15,130,8
-db 2,0,0,137,193,49,232,193,233,2,33,232,139,22,131,198
-db 4,137,23,131,199,4,73,117,243,41,198,41,199,138,6,70
-db 60,16,115,52,141,87,3,57,20,36,15,130,226,1,0,0
-db 193,232,2,138,30,141,151,255,247,255,255,141,4,152,70,41
-db 194,59,84,36,48,15,130,206,1,0,0,139,10,137,15,1
-db 239,233,151,0,0,0,137,246,60,64,114,68,137,193,193,232
-db 2,141,87,255,131,224,7,138,30,193,233,5,141,4,216,70
-db 41,194,131,193,4,57,232,115,73,233,170,0,0,0,5,255
-db 0,0,0,141,86,3,57,84,36,4,15,130,123,1,0,0
-db 138,30,70,8,219,116,231,141,76,24,36,49,192,235,17,144
-db 60,32,15,130,200,0,0,0,131,224,31,116,227,141,72,5
-db 102,139,6,141,87,255,193,232,2,131,198,2,41,194,57,232
-db 114,102,59,84,36,48,15,130,77,1,0,0,141,68,15,253
-db 193,233,2,57,4,36,15,130,54,1,0,0,139,26,131,194
-db 4,137,31,131,199,4,73,117,243,137,199,49,219,138,70,254
-db 33,232,15,132,216,254,255,255,141,20,7,57,20,36,15,130
-db 14,1,0,0,141,20,6,57,84,36,4,15,130,250,0,0
-db 0,139,22,1,198,137,23,1,199,138,6,70,233,55,255,255
-db 255,141,180,38,0,0,0,0,59,84,36,48,15,130,231,0
-db 0,0,141,68,15,253,57,4,36,15,130,211,0,0,0,135
-db 214,41,233,243,164,137,214,235,164,129,193,255,0,0,0,141
-db 86,3,57,84,36,4,15,130,175,0,0,0,138,30,70,8
-db 219,116,230,141,76,11,12,235,27,141,180,38,0,0,0,0
-db 60,16,114,44,137,193,131,224,8,193,224,13,131,225,7,116
-db 219,131,193,5,102,139,6,131,198,2,141,151,0,192,255,255
-db 193,232,2,116,57,41,194,233,38,255,255,255,141,116,38,0
-db 141,87,2,57,20,36,114,106,193,232,2,138,30,141,87,255
-db 141,4,152,70,41,194,59,84,36,48,114,93,138,2,136,7
-db 138,90,1,136,95,1,131,199,2,233,31,255,255,255,131,249
-db 6,15,149,192,59,60,36,119,57,139,84,36,40,3,84,36
-db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137
-db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0
-db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0
-db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199
-%ifdef NAME1
-globalf_end(NAME1(lzo1x_decompress_asm_fast_safe))
-%endif
-%ifdef NAME2
-globalf_end(NAME2(lzo1x_decompress_asm_fast_safe))
-%endif
diff --git a/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
index ad054be1..cd4cb71d 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_nasm/lzo1x_s2.asm b/main/lzo/asm/i386/src_nasm/lzo1x_s2.asm
deleted file mode 100644
index 5c655583..00000000
--- a/main/lzo/asm/i386/src_nasm/lzo1x_s2.asm
+++ /dev/null
@@ -1,109 +0,0 @@
-;  lzo1x_s2.asm -- lzo1x_decompress_asm_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-%include "asminit.def"
-%ifdef NAME1
-globalf(NAME1(lzo1x_decompress_asm_safe))
-%endif
-%ifdef NAME2
-globalf(NAME2(lzo1x_decompress_asm_safe))
-%endif
-%ifdef NAME1
-NAME1(lzo1x_decompress_asm_safe):
-%endif
-%ifdef NAME2
-NAME2(lzo1x_decompress_asm_safe):
-%endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,87,44,17,60,4,115,92,141,20,7,57
-db 20,36,15,130,130,2,0,0,141,20,6,57,84,36,4,15
-db 130,110,2,0,0,137,193,235,110,5,255,0,0,0,141,84
-db 6,18,57,84,36,4,15,130,87,2,0,0,138,30,70,8
-db 219,116,230,141,68,24,18,235,31,141,180,38,0,0,0,0
-db 57,116,36,4,15,130,57,2,0,0,138,6,70,60,16,115
-db 127,8,192,116,215,131,192,3,141,84,7,0,57,20,36,15
-db 130,37,2,0,0,141,84,6,0,57,84,36,4,15,130,16
-db 2,0,0,137,193,193,232,2,33,233,139,22,131,198,4,137
-db 23,131,199,4,72,117,243,243,164,138,6,70,60,16,115,64
-db 141,87,3,57,20,36,15,130,238,1,0,0,193,232,2,138
-db 30,141,151,255,247,255,255,141,4,152,70,41,194,59,84,36
-db 48,15,130,218,1,0,0,138,2,136,7,138,66,1,136,71
-db 1,138,66,2,136,71,2,1,239,233,163,0,0,0,137,246
-db 60,64,114,68,137,193,193,232,2,141,87,255,131,224,7,138
-db 30,193,233,5,141,4,216,70,41,194,65,57,232,115,75,233
-db 180,0,0,0,5,255,0,0,0,141,86,3,57,84,36,4
-db 15,130,125,1,0,0,138,30,70,8,219,116,231,141,76,24
-db 33,49,192,235,19,141,118,0,60,32,15,130,200,0,0,0
-db 131,224,31,116,225,141,72,2,102,139,6,141,87,255,193,232
-db 2,131,198,2,41,194,57,232,114,110,59,84,36,48,15,130
-db 77,1,0,0,141,4,15,57,4,36,15,130,58,1,0,0
-db 137,203,193,235,2,116,17,139,2,131,194,4,137,7,131,199
-db 4,75,117,243,33,233,116,9,138,2,66,136,7,71,73,117
-db 247,138,70,254,33,232,15,132,196,254,255,255,141,20,7,57
-db 20,36,15,130,2,1,0,0,141,20,6,57,84,36,4,15
-db 130,238,0,0,0,138,14,70,136,15,71,72,117,247,138,6
-db 70,233,42,255,255,255,137,246,59,84,36,48,15,130,223,0
-db 0,0,141,68,15,0,57,4,36,15,130,203,0,0,0,135
-db 214,243,164,137,214,235,170,129,193,255,0,0,0,141,86,3
-db 57,84,36,4,15,130,169,0,0,0,138,30,70,8,219,116
-db 230,141,76,11,9,235,21,144,60,16,114,44,137,193,131,224
-db 8,193,224,13,131,225,7,116,225,131,193,2,102,139,6,131
-db 198,2,141,151,0,192,255,255,193,232,2,116,57,41,194,233
-db 38,255,255,255,141,116,38,0,141,87,2,57,20,36,114,106
-db 193,232,2,138,30,141,87,255,141,4,152,70,41,194,59,84
-db 36,48,114,93,138,2,136,7,138,90,1,136,95,1,131,199
-db 2,233,43,255,255,255,131,249,3,15,149,192,59,60,36,119
-db 57,139,84,36,40,3,84,36,44,57,214,119,38,114,29,43
-db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89
-db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0
-db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235
-db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0
-%ifdef NAME1
-globalf_end(NAME1(lzo1x_decompress_asm_safe))
-%endif
-%ifdef NAME2
-globalf_end(NAME2(lzo1x_decompress_asm_safe))
-%endif
diff --git a/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
index ddd55fb1..6c65bb1c 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_nasm/lzo1y_f2.asm b/main/lzo/asm/i386/src_nasm/lzo1y_f2.asm
deleted file mode 100644
index 9e6b37c5..00000000
--- a/main/lzo/asm/i386/src_nasm/lzo1y_f2.asm
+++ /dev/null
@@ -1,106 +0,0 @@
-;  lzo1y_f2.asm -- lzo1y_decompress_asm_fast_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-%include "asminit.def"
-%ifdef NAME1
-globalf(NAME1(lzo1y_decompress_asm_fast_safe))
-%endif
-%ifdef NAME2
-globalf(NAME2(lzo1y_decompress_asm_fast_safe))
-%endif
-%ifdef NAME1
-NAME1(lzo1y_decompress_asm_fast_safe):
-%endif
-%ifdef NAME2
-NAME2(lzo1y_decompress_asm_fast_safe):
-%endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,55,44,14,235,62,5,255,0,0,0,141
-db 84,6,18,57,84,36,4,15,130,78,2,0,0,138,30,70
-db 8,219,116,230,141,68,24,21,235,30,141,182,0,0,0,0
-db 57,116,36,4,15,130,49,2,0,0,138,6,70,60,16,115
-db 119,8,192,116,216,131,192,6,141,84,7,253,57,20,36,15
-db 130,29,2,0,0,141,84,6,253,57,84,36,4,15,130,8
-db 2,0,0,137,193,49,232,193,233,2,33,232,139,22,131,198
-db 4,137,23,131,199,4,73,117,243,41,198,41,199,138,6,70
-db 60,16,115,52,141,87,3,57,20,36,15,130,226,1,0,0
-db 193,232,2,138,30,141,151,255,251,255,255,141,4,152,70,41
-db 194,59,84,36,48,15,130,206,1,0,0,139,10,137,15,1
-db 239,233,151,0,0,0,137,246,60,64,114,68,137,193,193,232
-db 2,141,87,255,33,232,138,30,193,233,4,141,4,152,70,41
-db 194,131,193,2,57,232,115,74,233,171,0,0,0,5,255,0
-db 0,0,141,86,3,57,84,36,4,15,130,124,1,0,0,138
-db 30,70,8,219,116,231,141,76,24,36,49,192,235,18,137,246
-db 60,32,15,130,200,0,0,0,131,224,31,116,226,141,72,5
-db 102,139,6,141,87,255,193,232,2,131,198,2,41,194,57,232
-db 114,102,59,84,36,48,15,130,77,1,0,0,141,68,15,253
-db 193,233,2,57,4,36,15,130,54,1,0,0,139,26,131,194
-db 4,137,31,131,199,4,73,117,243,137,199,49,219,138,70,254
-db 33,232,15,132,216,254,255,255,141,20,7,57,20,36,15,130
-db 14,1,0,0,141,20,6,57,84,36,4,15,130,250,0,0
-db 0,139,22,1,198,137,23,1,199,138,6,70,233,55,255,255
-db 255,141,180,38,0,0,0,0,59,84,36,48,15,130,231,0
-db 0,0,141,68,15,253,57,4,36,15,130,211,0,0,0,135
-db 214,41,233,243,164,137,214,235,164,129,193,255,0,0,0,141
-db 86,3,57,84,36,4,15,130,175,0,0,0,138,30,70,8
-db 219,116,230,141,76,11,12,235,27,141,180,38,0,0,0,0
-db 60,16,114,44,137,193,131,224,8,193,224,13,131,225,7,116
-db 219,131,193,5,102,139,6,131,198,2,141,151,0,192,255,255
-db 193,232,2,116,57,41,194,233,38,255,255,255,141,116,38,0
-db 141,87,2,57,20,36,114,106,193,232,2,138,30,141,87,255
-db 141,4,152,70,41,194,59,84,36,48,114,93,138,2,136,7
-db 138,90,1,136,95,1,131,199,2,233,31,255,255,255,131,249
-db 6,15,149,192,59,60,36,119,57,139,84,36,40,3,84,36
-db 44,57,214,119,38,114,29,43,124,36,48,139,84,36,52,137
-db 58,247,216,131,196,12,90,89,91,94,95,93,195,184,1,0
-db 0,0,235,227,184,8,0,0,0,235,220,184,4,0,0,0
-db 235,213,184,5,0,0,0,235,206,184,6,0,0,0,235,199
-%ifdef NAME1
-globalf_end(NAME1(lzo1y_decompress_asm_fast_safe))
-%endif
-%ifdef NAME2
-globalf_end(NAME2(lzo1y_decompress_asm_fast_safe))
-%endif
diff --git a/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
index ce880041..08aeec31 100644
--- a/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
+++ b/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
@@ -2,7 +2,7 @@
 ;
 ;  This file is part of the LZO real-time data compression library.
 ;
-;  Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
+;  Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
 ;  All Rights Reserved.
 ;
 ;  The LZO library is free software; you can redistribute it and/or
diff --git a/main/lzo/asm/i386/src_nasm/lzo1y_s2.asm b/main/lzo/asm/i386/src_nasm/lzo1y_s2.asm
deleted file mode 100644
index 065508cb..00000000
--- a/main/lzo/asm/i386/src_nasm/lzo1y_s2.asm
+++ /dev/null
@@ -1,109 +0,0 @@
-;  lzo1y_s2.asm -- lzo1y_decompress_asm_safe
-;
-;  This file is part of the LZO real-time data compression library.
-;
-;  Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer
-;  Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer
-;  All Rights Reserved.
-;
-;  The LZO library is free software; you can redistribute it and/or
-;  modify it under the terms of the GNU General Public License as
-;  published by the Free Software Foundation; either version 2 of
-;  the License, or (at your option) any later version.
-;
-;  The LZO library is distributed in the hope that it will be useful,
-;  but WITHOUT ANY WARRANTY; without even the implied warranty of
-;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;  GNU General Public License for more details.
-;
-;  You should have received a copy of the GNU General Public License
-;  along with the LZO library; see the file COPYING.
-;  If not, write to the Free Software Foundation, Inc.,
-;  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;
-;  Markus F.X.J. Oberhumer
-;  <markus@oberhumer.com>
-;  http://www.oberhumer.com/opensource/lzo/
-;
-
-; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
-
-%include "asminit.def"
-%ifdef NAME1
-globalf(NAME1(lzo1y_decompress_asm_safe))
-%endif
-%ifdef NAME2
-globalf(NAME2(lzo1y_decompress_asm_safe))
-%endif
-%ifdef NAME1
-NAME1(lzo1y_decompress_asm_safe):
-%endif
-%ifdef NAME2
-NAME2(lzo1y_decompress_asm_safe):
-%endif
-db 85,87,86,83,81,82,131,236,12,252,139,116,36,40,139,124
-db 36,48,189,3,0,0,0,141,70,253,3,68,36,44,137,68
-db 36,4,137,248,139,84,36,52,3,2,137,4,36,49,192,49
-db 219,172,60,17,118,87,44,17,60,4,115,92,141,20,7,57
-db 20,36,15,130,130,2,0,0,141,20,6,57,84,36,4,15
-db 130,110,2,0,0,137,193,235,110,5,255,0,0,0,141,84
-db 6,18,57,84,36,4,15,130,87,2,0,0,138,30,70,8
-db 219,116,230,141,68,24,18,235,31,141,180,38,0,0,0,0
-db 57,116,36,4,15,130,57,2,0,0,138,6,70,60,16,115
-db 127,8,192,116,215,131,192,3,141,84,7,0,57,20,36,15
-db 130,37,2,0,0,141,84,6,0,57,84,36,4,15,130,16
-db 2,0,0,137,193,193,232,2,33,233,139,22,131,198,4,137
-db 23,131,199,4,72,117,243,243,164,138,6,70,60,16,115,64
-db 141,87,3,57,20,36,15,130,238,1,0,0,193,232,2,138
-db 30,141,151,255,251,255,255,141,4,152,70,41,194,59,84,36
-db 48,15,130,218,1,0,0,138,2,136,7,138,66,1,136,71
-db 1,138,66,2,136,71,2,1,239,233,163,0,0,0,137,246
-db 60,64,114,68,137,193,193,232,2,141,87,255,33,232,138,30
-db 193,233,4,141,4,152,70,41,194,73,57,232,115,76,233,181
-db 0,0,0,5,255,0,0,0,141,86,3,57,84,36,4,15
-db 130,126,1,0,0,138,30,70,8,219,116,231,141,76,24,33
-db 49,192,235,20,141,116,38,0,60,32,15,130,200,0,0,0
-db 131,224,31,116,224,141,72,2,102,139,6,141,87,255,193,232
-db 2,131,198,2,41,194,57,232,114,110,59,84,36,48,15,130
-db 77,1,0,0,141,4,15,57,4,36,15,130,58,1,0,0
-db 137,203,193,235,2,116,17,139,2,131,194,4,137,7,131,199
-db 4,75,117,243,33,233,116,9,138,2,66,136,7,71,73,117
-db 247,138,70,254,33,232,15,132,196,254,255,255,141,20,7,57
-db 20,36,15,130,2,1,0,0,141,20,6,57,84,36,4,15
-db 130,238,0,0,0,138,14,70,136,15,71,72,117,247,138,6
-db 70,233,42,255,255,255,137,246,59,84,36,48,15,130,223,0
-db 0,0,141,68,15,0,57,4,36,15,130,203,0,0,0,135
-db 214,243,164,137,214,235,170,129,193,255,0,0,0,141,86,3
-db 57,84,36,4,15,130,169,0,0,0,138,30,70,8,219,116
-db 230,141,76,11,9,235,21,144,60,16,114,44,137,193,131,224
-db 8,193,224,13,131,225,7,116,225,131,193,2,102,139,6,131
-db 198,2,141,151,0,192,255,255,193,232,2,116,57,41,194,233
-db 38,255,255,255,141,116,38,0,141,87,2,57,20,36,114,106
-db 193,232,2,138,30,141,87,255,141,4,152,70,41,194,59,84
-db 36,48,114,93,138,2,136,7,138,90,1,136,95,1,131,199
-db 2,233,43,255,255,255,131,249,3,15,149,192,59,60,36,119
-db 57,139,84,36,40,3,84,36,44,57,214,119,38,114,29,43
-db 124,36,48,139,84,36,52,137,58,247,216,131,196,12,90,89
-db 91,94,95,93,195,184,1,0,0,0,235,227,184,8,0,0
-db 0,235,220,184,4,0,0,0,235,213,184,5,0,0,0,235
-db 206,184,6,0,0,0,235,199,144,141,180,38,0,0,0,0
-%ifdef NAME1
-globalf_end(NAME1(lzo1y_decompress_asm_safe))
-%endif
-%ifdef NAME2
-globalf_end(NAME2(lzo1y_decompress_asm_safe))
-%endif
author	Arne Schwabe <arne@rfc2549.org>	2017-06-22 18:33:26 +0200
committer	Arne Schwabe <arne@rfc2549.org>	2017-06-22 18:33:26 +0200
commit	6c12bd2094234edc1a129969b89cf45b1da889bd (patch)
tree	a39b3af9ad861334a844035d4d88232c8f9ed0ec /main/lzo/asm/i386
parent	f35afa13da08a058bc28ca0e535e044093148e3a (diff)