summaryrefslogtreecommitdiff
path: root/main/lzo/asm
diff options
context:
space:
mode:
Diffstat (limited to 'main/lzo/asm')
-rw-r--r--main/lzo/asm/i386/obj/macho32/lzo1c_s1.obin0 -> 499 bytes
-rw-r--r--main/lzo/asm/i386/obj/macho32/lzo1f_f1.obin0 -> 536 bytes
-rw-r--r--main/lzo/asm/i386/obj/macho32/lzo1x_f1.obin0 -> 664 bytes
-rw-r--r--main/lzo/asm/i386/obj/macho32/lzo1x_s1.obin0 -> 691 bytes
-rw-r--r--main/lzo/asm/i386/obj/macho32/lzo1y_f1.obin0 -> 664 bytes
-rw-r--r--main/lzo/asm/i386/obj/macho32/lzo1y_s1.obin0 -> 691 bytes
-rw-r--r--main/lzo/asm/i386/src/enter.ash7
-rw-r--r--main/lzo/asm/i386/src/leave.ash7
-rw-r--r--main/lzo/asm/i386/src/lzo1c_d.ash7
-rw-r--r--main/lzo/asm/i386/src/lzo1c_s1.S7
-rw-r--r--main/lzo/asm/i386/src/lzo1f_d.ash7
-rw-r--r--main/lzo/asm/i386/src/lzo1f_f1.S7
-rw-r--r--main/lzo/asm/i386/src/lzo1x_d.ash7
-rw-r--r--main/lzo/asm/i386/src/lzo1x_f1.S7
-rw-r--r--main/lzo/asm/i386/src/lzo1x_s1.S7
-rw-r--r--main/lzo/asm/i386/src/lzo1y_f1.S7
-rw-r--r--main/lzo/asm/i386/src/lzo1y_s1.S7
-rw-r--r--main/lzo/asm/i386/src/lzo_asm.h8
-rw-r--r--main/lzo/asm/i386/src_gas/all/asm_all.S44
-rw-r--r--main/lzo/asm/i386/src_gas/asminit.def45
-rw-r--r--main/lzo/asm/i386/src_gas/lzo1c_s1.S2
-rw-r--r--main/lzo/asm/i386/src_gas/lzo1f_f1.S2
-rw-r--r--main/lzo/asm/i386/src_gas/lzo1x_f1.S2
-rw-r--r--main/lzo/asm/i386/src_gas/lzo1x_s1.S2
-rw-r--r--main/lzo/asm/i386/src_gas/lzo1y_f1.S2
-rw-r--r--main/lzo/asm/i386/src_gas/lzo1y_s1.S2
-rw-r--r--main/lzo/asm/i386/src_masm/all/asm_all.asm2
-rw-r--r--main/lzo/asm/i386/src_masm/asminit.def2
-rw-r--r--main/lzo/asm/i386/src_masm/lzo1c_s1.asm2
-rw-r--r--main/lzo/asm/i386/src_masm/lzo1f_f1.asm2
-rw-r--r--main/lzo/asm/i386/src_masm/lzo1x_f1.asm2
-rw-r--r--main/lzo/asm/i386/src_masm/lzo1x_s1.asm2
-rw-r--r--main/lzo/asm/i386/src_masm/lzo1y_f1.asm2
-rw-r--r--main/lzo/asm/i386/src_masm/lzo1y_s1.asm2
-rw-r--r--main/lzo/asm/i386/src_nasm/all/asm_all.asm35
-rw-r--r--main/lzo/asm/i386/src_nasm/asminit.def38
-rw-r--r--main/lzo/asm/i386/src_nasm/lzo1c_s1.asm2
-rw-r--r--main/lzo/asm/i386/src_nasm/lzo1f_f1.asm2
-rw-r--r--main/lzo/asm/i386/src_nasm/lzo1x_f1.asm2
-rw-r--r--main/lzo/asm/i386/src_nasm/lzo1x_s1.asm2
-rw-r--r--main/lzo/asm/i386/src_nasm/lzo1y_f1.asm2
-rw-r--r--main/lzo/asm/i386/src_nasm/lzo1y_s1.asm2
42 files changed, 164 insertions, 123 deletions
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1c_s1.o b/main/lzo/asm/i386/obj/macho32/lzo1c_s1.o
new file mode 100644
index 00000000..d70edd91
--- /dev/null
+++ b/main/lzo/asm/i386/obj/macho32/lzo1c_s1.o
Binary files differ
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1f_f1.o b/main/lzo/asm/i386/obj/macho32/lzo1f_f1.o
new file mode 100644
index 00000000..06cc4909
--- /dev/null
+++ b/main/lzo/asm/i386/obj/macho32/lzo1f_f1.o
Binary files differ
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1x_f1.o b/main/lzo/asm/i386/obj/macho32/lzo1x_f1.o
new file mode 100644
index 00000000..3644103a
--- /dev/null
+++ b/main/lzo/asm/i386/obj/macho32/lzo1x_f1.o
Binary files differ
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1x_s1.o b/main/lzo/asm/i386/obj/macho32/lzo1x_s1.o
new file mode 100644
index 00000000..79edb273
--- /dev/null
+++ b/main/lzo/asm/i386/obj/macho32/lzo1x_s1.o
Binary files differ
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1y_f1.o b/main/lzo/asm/i386/obj/macho32/lzo1y_f1.o
new file mode 100644
index 00000000..68e0a005
--- /dev/null
+++ b/main/lzo/asm/i386/obj/macho32/lzo1y_f1.o
Binary files differ
diff --git a/main/lzo/asm/i386/obj/macho32/lzo1y_s1.o b/main/lzo/asm/i386/obj/macho32/lzo1y_s1.o
new file mode 100644
index 00000000..f47ecade
--- /dev/null
+++ b/main/lzo/asm/i386/obj/macho32/lzo1y_s1.o
Binary files differ
diff --git a/main/lzo/asm/i386/src/enter.ash b/main/lzo/asm/i386/src/enter.ash
index c121c573..fbfc9b8b 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -71,7 +71,4 @@
#endif
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/leave.ash b/main/lzo/asm/i386/src/leave.ash
index 2aa02867..209e2bbd 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -96,7 +96,4 @@
.L_end:
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1c_d.ash b/main/lzo/asm/i386/src/lzo1c_d.ash
index 4560452b..d373ed26 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -166,7 +166,4 @@
setnz %al
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1c_s1.S b/main/lzo/asm/i386/src/lzo1c_s1.S
index d1cdd628..2de44637 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -43,7 +43,4 @@
LZO_PUBLIC_END(lzo1c_decompress_asm)
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1f_d.ash b/main/lzo/asm/i386/src/lzo1f_d.ash
index 50248d8b..edbe0a6a 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -158,7 +158,4 @@
setnz %al
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1f_f1.S b/main/lzo/asm/i386/src/lzo1f_f1.S
index 5566cc57..b77c8943 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -43,7 +43,4 @@
LZO_PUBLIC_END(lzo1f_decompress_asm_fast)
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1x_d.ash b/main/lzo/asm/i386/src/lzo1x_d.ash
index a05f15dc..35d1ca4f 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -383,7 +383,4 @@
setnz %al
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1x_f1.S b/main/lzo/asm/i386/src/lzo1x_f1.S
index f9706f13..20810526 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -45,7 +45,4 @@
LZO_PUBLIC_END(lzo1x_decompress_asm_fast)
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1x_s1.S b/main/lzo/asm/i386/src/lzo1x_s1.S
index 198980de..c034d7a3 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -43,7 +43,4 @@
LZO_PUBLIC_END(lzo1x_decompress_asm)
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1y_f1.S b/main/lzo/asm/i386/src/lzo1y_f1.S
index 98ab9152..2fbd0228 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -47,7 +47,4 @@
LZO_PUBLIC_END(lzo1y_decompress_asm_fast)
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo1y_s1.S b/main/lzo/asm/i386/src/lzo1y_s1.S
index b48212f5..245a8f7a 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -45,7 +45,4 @@
LZO_PUBLIC_END(lzo1y_decompress_asm)
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
diff --git a/main/lzo/asm/i386/src/lzo_asm.h b/main/lzo/asm/i386/src/lzo_asm.h
index 1958517d..538b4089 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -268,8 +268,4 @@
#endif
-
-/*
-vi:ts=4
-*/
-
+/* vim:set ts=4 sw=4 et: */
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 6da894b2..730ed07a 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -27,36 +27,60 @@
/***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
+#ifndef NAME1
#if (defined(__MACH__) && defined(__APPLE__))
-# define NAME1(x) _ ## x
+# define NAME1(a) _ ## a
#else
-# define NAME1(x) _ ## x
-# define NAME2(x) x
+# define NAME1(a) _ ## a
+# define NAME2(a) a
+#endif
+#endif
+#ifndef LZO_PP_CONCAT2
+# define LZO_PP_CONCAT2(a,b) a ## b
#endif
#ifndef p2align
-# define p2align(x) .p2align x
+# define p2align(a) .p2align a
#endif
#ifndef globalf
-# define globalf(x) .globl x
+# define globalf(a) .globl a
+#endif
+#ifndef hiddenf
+# if defined(__ELF__)
+# define hiddenf(a) .hidden a
+# elif (defined(__MACH__) && defined(__APPLE__))
+# define hiddenf(a) .private_extern a
+# else
+# define hiddenf(a)
+# endif
#endif
#ifndef typef
# if defined(__ELF__)
-# define typef(x) .type x,@function
+# define typef(a) .type a,@function
# else
-# define typef(x)
+# define typef(a)
# endif
#endif
#ifndef sizef
# if defined(__ELF__)
-# define sizef(x,s) .size x,s
+# define sizef(a,b) .size a,b
# else
-# define sizef(x,s)
+# 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(__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__)
p2align(6)
#else
diff --git a/main/lzo/asm/i386/src_gas/asminit.def b/main/lzo/asm/i386/src_gas/asminit.def
index 1115582f..257190d0 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
All Rights Reserved.
The LZO library is free software; you can redistribute it and/or
@@ -25,31 +25,46 @@
http://www.oberhumer.com/opensource/lzo/
*/
+#ifndef NAME1
#if (defined(__MACH__) && defined(__APPLE__))
-# define NAME1(x) _ ## x
+# define NAME1(a) _ ## a
#else
-# define NAME1(x) _ ## x
-# define NAME2(x) x
+# define NAME1(a) _ ## a
+# define NAME2(a) a
+#endif
+#endif
+
+#ifndef LZO_PP_CONCAT2
+# define LZO_PP_CONCAT2(a,b) a ## b
#endif
#ifndef p2align
-# define p2align(x) .p2align x
+# define p2align(a) .p2align a
#endif
#ifndef globalf
-# define globalf(x) .globl x
+# define globalf(a) .globl a
+#endif
+#ifndef hiddenf
+# if defined(__ELF__)
+# define hiddenf(a) .hidden a
+# elif (defined(__MACH__) && defined(__APPLE__))
+# define hiddenf(a) .private_extern a
+# else
+# define hiddenf(a)
+# endif
#endif
#ifndef typef
# if defined(__ELF__)
-# define typef(x) .type x,@function
+# define typef(a) .type a,@function
# else
-# define typef(x)
+# define typef(a)
# endif
#endif
#ifndef sizef
# if defined(__ELF__)
-# define sizef(x,s) .size x,s
+# define sizef(a,b) .size a,b
# else
-# define sizef(x,s)
+# define sizef(a,b)
# endif
#endif
@@ -57,6 +72,16 @@
.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(__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__)
p2align(6)
#else
diff --git a/main/lzo/asm/i386/src_gas/lzo1c_s1.S b/main/lzo/asm/i386/src_gas/lzo1c_s1.S
index c21ef485..4f15ca8f 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 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_f1.S b/main/lzo/asm/i386/src_gas/lzo1f_f1.S
index eec8c8a6..a2c3c4e4 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 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_f1.S b/main/lzo/asm/i386/src_gas/lzo1x_f1.S
index 87ef8d7d..8e2bcc9e 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 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_s1.S b/main/lzo/asm/i386/src_gas/lzo1x_s1.S
index 69523a73..ed43092b 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 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_f1.S b/main/lzo/asm/i386/src_gas/lzo1y_f1.S
index cfc59937..32ee007a 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 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_s1.S b/main/lzo/asm/i386/src_gas/lzo1y_s1.S
index b7900ca6..6a52bbbc 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-2014 Markus Franz Xaver Johannes Oberhumer
+ Copyright (C) 1996-2015 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/all/asm_all.asm b/main/lzo/asm/i386/src_masm/all/asm_all.asm
index c35e2969..bda48d44 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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 81a9d21c..749eb9b5 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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 f6aae35f..f9418df3 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_f1.asm b/main/lzo/asm/i386/src_masm/lzo1f_f1.asm
index 23ee4493..ec51f0ba 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_f1.asm b/main/lzo/asm/i386/src_masm/lzo1x_f1.asm
index 7e77a174..efe2f040 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_s1.asm b/main/lzo/asm/i386/src_masm/lzo1x_s1.asm
index f466aa8a..1c31acc5 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_f1.asm b/main/lzo/asm/i386/src_masm/lzo1y_f1.asm
index c4ff7a36..f111ccb5 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_s1.asm b/main/lzo/asm/i386/src_masm/lzo1y_s1.asm
index 4c8d7108..c7779489 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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/all/asm_all.asm b/main/lzo/asm/i386/src_nasm/all/asm_all.asm
index b0df7de7..f453e626 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
@@ -49,23 +49,36 @@ bits 32
%define __OUTPUT_FORMAT__ win64
%endif
%endif
+%ifndef NAME1
%ifidni __OUTPUT_FORMAT__,macho32
-%define NAME1(x) _ %+ x
+%define NAME1(a) _ %+ a
%elifidni __OUTPUT_FORMAT__,macho64
-%define NAME1(x) _ %+ x
+%define NAME1(a) _ %+ a
%else
-%define NAME1(x) _ %+ x
-%define NAME2(x) x
+%define NAME1(a) _ %+ a
+%define NAME2(a) a
+%endif
%endif
%ifidni __OUTPUT_FORMAT__,elf32
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%elifidni __OUTPUT_FORMAT__,elf64
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%else
-%define globalf(x) global x
-%define globalf_end(x)
+%define globalf(a) global a
+%define globalfh(a) global a
+%define globalf_end(a)
+%endif
+%ifndef LZO_SEH_EXCEPTIONS
+%ifidni __OUTPUT_FORMAT__,win64
+%define LZO_SEH_EXCEPTIONS 1
+%endif
+%endif
+%ifndef LZO_SEH_EXCEPTIONS
+%define LZO_SEH_EXCEPTIONS 0
%endif
%ifidni __OUTPUT_FORMAT__,elf32
section .note.GNU-stack noalloc noexec nowrite progbits
diff --git a/main/lzo/asm/i386/src_nasm/asminit.def b/main/lzo/asm/i386/src_nasm/asminit.def
index 0ccdb8d7..773cf997 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
@@ -48,24 +48,40 @@ bits 32
%endif
%endif
+%ifndef NAME1
%ifidni __OUTPUT_FORMAT__,macho32
-%define NAME1(x) _ %+ x
+%define NAME1(a) _ %+ a
%elifidni __OUTPUT_FORMAT__,macho64
-%define NAME1(x) _ %+ x
+%define NAME1(a) _ %+ a
%else
-%define NAME1(x) _ %+ x
-%define NAME2(x) x
+%define NAME1(a) _ %+ a
+%define NAME2(a) a
+%endif
%endif
%ifidni __OUTPUT_FORMAT__,elf32
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+;define globalfh(a) global a:function hidden
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%elifidni __OUTPUT_FORMAT__,elf64
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+;define globalfh(a) global a:function hidden
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%else
-%define globalf(x) global x
-%define globalf_end(x)
+%define globalf(a) global a
+%define globalfh(a) global a
+%define globalf_end(a)
+%endif
+
+%ifndef LZO_SEH_EXCEPTIONS
+%ifidni __OUTPUT_FORMAT__,win64
+%define LZO_SEH_EXCEPTIONS 1
+%endif
+%endif
+%ifndef LZO_SEH_EXCEPTIONS
+%define LZO_SEH_EXCEPTIONS 0
%endif
%ifidni __OUTPUT_FORMAT__,elf32
diff --git a/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1c_s1.asm
index e35e627b..982b4745 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1f_f1.asm
index 514ab474..ccf37ed7 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1x_f1.asm
index 585963b7..e269caa0 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1x_s1.asm
index 98790b91..ad054be1 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_f1.asm b/main/lzo/asm/i386/src_nasm/lzo1y_f1.asm
index 6ca700d8..ddd55fb1 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 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_s1.asm b/main/lzo/asm/i386/src_nasm/lzo1y_s1.asm
index b5c6ee75..ce880041 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-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2015 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or