Update lzo version

14 files changed, 525 insertions, 102 deletions

diff --git a/lzo/asm/i386/src_nasm/all/asm_all.asm b/lzo/asm/i386/src_nasm/all/asm_all.asm
index e37965a..2751256 100644
--- a/lzo/asm/i386/src_nasm/all/asm_all.asm
+++ b/lzo/asm/i386/src_nasm/all/asm_all.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -39,26 +42,56 @@
 
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
-%define F(name) name
+%ifidni __OUTPUT_FORMAT__,macho
+%define NAME1(x)        _ %+ x
+%elifidni __OUTPUT_FORMAT__,macho32
+%define NAME1(x)        _ %+ x
+%elifidni __OUTPUT_FORMAT__,macho64
+%define NAME1(x)        _ %+ x
+%else
+%define NAME1(x)        _ %+ x
+%define NAME2(x)             x
+%endif
 %ifidni __OUTPUT_FORMAT__,elf
-%define globalf(x) global x:function
+%define globalf(x)      global x:function (x %+ _end - x)
+%define globalf_end(x)  x %+ _end:
+%elifidni __OUTPUT_FORMAT__,elf32
+%define globalf(x)      global x:function (x %+ _end - x)
+%define globalf_end(x)  x %+ _end:
+%elifidni __OUTPUT_FORMAT__,elf64
+%define globalf(x)      global x:function (x %+ _end - x)
+%define globalf_end(x)  x %+ _end:
 %else
-%define globalf(x) global x
+%define globalf(x)      global x
+%define globalf_end(x)
 %endif
 bits 32
 %ifidni __OUTPUT_FORMAT__,elf
 section .note.GNU-stack noalloc noexec nowrite progbits
+%elifidni __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%elifidni __OUTPUT_FORMAT__,elf64
+section .note.GNU-stack noalloc noexec nowrite progbits
 %endif
 %ifidni __OUTPUT_FORMAT__,obj
 segment _TEXT class=CODE public use32 flat align=16
 %else
 section .text
 %endif
+align 16
 
-globalf(_lzo1c_decompress_asm)
-globalf(F(lzo1c_decompress_asm))
-_lzo1c_decompress_asm:
-F(lzo1c_decompress_asm):
+%ifdef NAME1
+globalf(NAME1(lzo1c_decompress_asm))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1c_decompress_asm))
+%endif
+%ifdef NAME1
+NAME1(lzo1c_decompress_asm):
+%endif
+%ifdef NAME2
+NAME2(lzo1c_decompress_asm):
+%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,144,49,192,138,6,70,60,32,115
 db 15,8,192,116,51,137,193,243,164,138,6,70,60,32,114,72
@@ -77,11 +110,25 @@ db 149,192,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,144,141,116,38,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1c_decompress_asm))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1c_decompress_asm))
+%endif
 
-globalf(_lzo1c_decompress_asm_safe)
-globalf(F(lzo1c_decompress_asm_safe))
-_lzo1c_decompress_asm_safe:
-F(lzo1c_decompress_asm_safe):
+%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
@@ -111,11 +158,25 @@ 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
 
-globalf(_lzo1f_decompress_asm_fast)
-globalf(F(lzo1f_decompress_asm_fast))
-_lzo1f_decompress_asm_fast:
-F(lzo1f_decompress_asm_fast):
+%ifdef NAME1
+globalf(NAME1(lzo1f_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1f_decompress_asm_fast))
+%endif
+%ifdef NAME1
+NAME1(lzo1f_decompress_asm_fast):
+%endif
+%ifdef NAME2
+NAME2(lzo1f_decompress_asm_fast):
+%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,144,49,192,138,6,70,60,31,119
 db 51,8,192,137,193,117,19,138,6,70,8,192,117,8,129,193
@@ -136,11 +197,25 @@ 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,141,118,0,141,188,39,0,0,0,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1f_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1f_decompress_asm_fast))
+%endif
 
-globalf(_lzo1f_decompress_asm_fast_safe)
-globalf(F(lzo1f_decompress_asm_fast_safe))
-_lzo1f_decompress_asm_fast_safe:
-F(lzo1f_decompress_asm_fast_safe):
+%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
@@ -168,11 +243,25 @@ 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
 
-globalf(_lzo1x_decompress_asm_fast)
-globalf(F(lzo1x_decompress_asm_fast))
-_lzo1x_decompress_asm_fast:
-F(lzo1x_decompress_asm_fast):
+%ifdef NAME1
+globalf(NAME1(lzo1x_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1x_decompress_asm_fast))
+%endif
+%ifdef NAME1
+NAME1(lzo1x_decompress_asm_fast):
+%endif
+%ifdef NAME2
+NAME2(lzo1x_decompress_asm_fast):
+%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,49,192,49,219,172,60,17,118,27
 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244
@@ -201,11 +290,25 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214
 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216
 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235
 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144
+%ifdef NAME1
+globalf_end(NAME1(lzo1x_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1x_decompress_asm_fast))
+%endif
 
-globalf(_lzo1x_decompress_asm_fast_safe)
-globalf(F(lzo1x_decompress_asm_fast_safe))
-_lzo1x_decompress_asm_fast_safe:
-F(lzo1x_decompress_asm_fast_safe):
+%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
@@ -249,11 +352,25 @@ 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
 
-globalf(_lzo1x_decompress_asm)
-globalf(F(lzo1x_decompress_asm))
-_lzo1x_decompress_asm:
-F(lzo1x_decompress_asm):
+%ifdef NAME1
+globalf(NAME1(lzo1x_decompress_asm))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1x_decompress_asm))
+%endif
+%ifdef NAME1
+NAME1(lzo1x_decompress_asm):
+%endif
+%ifdef NAME2
+NAME2(lzo1x_decompress_asm):
+%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,49,192,49,219,172,60,17,118,35
 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138
@@ -284,11 +401,25 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48
 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95
 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220
 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1x_decompress_asm))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1x_decompress_asm))
+%endif
 
-globalf(_lzo1x_decompress_asm_safe)
-globalf(F(lzo1x_decompress_asm_safe))
-_lzo1x_decompress_asm_safe:
-F(lzo1x_decompress_asm_safe):
+%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
@@ -335,11 +466,25 @@ 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
 
-globalf(_lzo1y_decompress_asm_fast)
-globalf(F(lzo1y_decompress_asm_fast))
-_lzo1y_decompress_asm_fast:
-F(lzo1y_decompress_asm_fast):
+%ifdef NAME1
+globalf(NAME1(lzo1y_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1y_decompress_asm_fast))
+%endif
+%ifdef NAME1
+NAME1(lzo1y_decompress_asm_fast):
+%endif
+%ifdef NAME2
+NAME2(lzo1y_decompress_asm_fast):
+%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,49,192,49,219,172,60,17,118,27
 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244
@@ -368,11 +513,25 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214
 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216
 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235
 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144
+%ifdef NAME1
+globalf_end(NAME1(lzo1y_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1y_decompress_asm_fast))
+%endif
 
-globalf(_lzo1y_decompress_asm_fast_safe)
-globalf(F(lzo1y_decompress_asm_fast_safe))
-_lzo1y_decompress_asm_fast_safe:
-F(lzo1y_decompress_asm_fast_safe):
+%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
@@ -416,11 +575,25 @@ 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
 
-globalf(_lzo1y_decompress_asm)
-globalf(F(lzo1y_decompress_asm))
-_lzo1y_decompress_asm:
-F(lzo1y_decompress_asm):
+%ifdef NAME1
+globalf(NAME1(lzo1y_decompress_asm))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1y_decompress_asm))
+%endif
+%ifdef NAME1
+NAME1(lzo1y_decompress_asm):
+%endif
+%ifdef NAME2
+NAME2(lzo1y_decompress_asm):
+%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,49,192,49,219,172,60,17,118,35
 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138
@@ -451,11 +624,25 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48
 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95
 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220
 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1y_decompress_asm))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1y_decompress_asm))
+%endif
 
-globalf(_lzo1y_decompress_asm_safe)
-globalf(F(lzo1y_decompress_asm_safe))
-_lzo1y_decompress_asm_safe:
-F(lzo1y_decompress_asm_safe):
+%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
@@ -502,4 +689,10 @@ 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
 
diff --git a/lzo/asm/i386/src_nasm/asminit.def b/lzo/asm/i386/src_nasm/asminit.def
index 6942a81..3f2e0d6 100644
--- a/lzo/asm/i386/src_nasm/asminit.def
+++ b/lzo/asm/i386/src_nasm/asminit.def
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -37,19 +40,42 @@
 ;  http://www.oberhumer.com/opensource/lzo/
 ;
 
-%define F(name) name
+%ifidni __OUTPUT_FORMAT__,macho
+%define NAME1(x)        _ %+ x
+%elifidni __OUTPUT_FORMAT__,macho32
+%define NAME1(x)        _ %+ x
+%elifidni __OUTPUT_FORMAT__,macho64
+%define NAME1(x)        _ %+ x
+%else
+%define NAME1(x)        _ %+ x
+%define NAME2(x)             x
+%endif
+
 %ifidni __OUTPUT_FORMAT__,elf
-%define globalf(x) global x:function
+%define globalf(x)      global x:function (x %+ _end - x)
+%define globalf_end(x)  x %+ _end:
+%elifidni __OUTPUT_FORMAT__,elf32
+%define globalf(x)      global x:function (x %+ _end - x)
+%define globalf_end(x)  x %+ _end:
+%elifidni __OUTPUT_FORMAT__,elf64
+%define globalf(x)      global x:function (x %+ _end - x)
+%define globalf_end(x)  x %+ _end:
 %else
-%define globalf(x) global x
+%define globalf(x)      global x
+%define globalf_end(x)
 %endif
 
 bits 32
 %ifidni __OUTPUT_FORMAT__,elf
 section .note.GNU-stack noalloc noexec nowrite progbits
+%elifidni __OUTPUT_FORMAT__,elf32
+section .note.GNU-stack noalloc noexec nowrite progbits
+%elifidni __OUTPUT_FORMAT__,elf64
+section .note.GNU-stack noalloc noexec nowrite progbits
 %endif
 %ifidni __OUTPUT_FORMAT__,obj
 segment _TEXT class=CODE public use32 flat align=16
 %else
 section .text
 %endif
+align 16
diff --git a/lzo/asm/i386/src_nasm/lzo1c_s1.asm b/lzo/asm/i386/src_nasm/lzo1c_s1.asm
index b693a59..c9bb264 100644
--- a/lzo/asm/i386/src_nasm/lzo1c_s1.asm
+++ b/lzo/asm/i386/src_nasm/lzo1c_s1.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1c_decompress_asm)
-globalf(F(lzo1c_decompress_asm))
-_lzo1c_decompress_asm:
-F(lzo1c_decompress_asm):
+%ifdef NAME1
+globalf(NAME1(lzo1c_decompress_asm))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1c_decompress_asm))
+%endif
+%ifdef NAME1
+NAME1(lzo1c_decompress_asm):
+%endif
+%ifdef NAME2
+NAME2(lzo1c_decompress_asm):
+%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,144,49,192,138,6,70,60,32,115
 db 15,8,192,116,51,137,193,243,164,138,6,70,60,32,114,72
@@ -62,3 +73,9 @@ db 149,192,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,144,141,116,38,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1c_decompress_asm))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1c_decompress_asm))
+%endif
diff --git a/lzo/asm/i386/src_nasm/lzo1c_s2.asm b/lzo/asm/i386/src_nasm/lzo1c_s2.asm
index addc8ae..89fa736 100644
--- a/lzo/asm/i386/src_nasm/lzo1c_s2.asm
+++ b/lzo/asm/i386/src_nasm/lzo1c_s2.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1c_decompress_asm_safe)
-globalf(F(lzo1c_decompress_asm_safe))
-_lzo1c_decompress_asm_safe:
-F(lzo1c_decompress_asm_safe):
+%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
@@ -73,3 +84,9 @@ 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/lzo/asm/i386/src_nasm/lzo1f_f1.asm b/lzo/asm/i386/src_nasm/lzo1f_f1.asm
index 51b4d96..cdbaade 100644
--- a/lzo/asm/i386/src_nasm/lzo1f_f1.asm
+++ b/lzo/asm/i386/src_nasm/lzo1f_f1.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1f_decompress_asm_fast)
-globalf(F(lzo1f_decompress_asm_fast))
-_lzo1f_decompress_asm_fast:
-F(lzo1f_decompress_asm_fast):
+%ifdef NAME1
+globalf(NAME1(lzo1f_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1f_decompress_asm_fast))
+%endif
+%ifdef NAME1
+NAME1(lzo1f_decompress_asm_fast):
+%endif
+%ifdef NAME2
+NAME2(lzo1f_decompress_asm_fast):
+%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,144,49,192,138,6,70,60,31,119
 db 51,8,192,137,193,117,19,138,6,70,8,192,117,8,129,193
@@ -64,3 +75,9 @@ 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,141,118,0,141,188,39,0,0,0,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1f_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1f_decompress_asm_fast))
+%endif
diff --git a/lzo/asm/i386/src_nasm/lzo1f_f2.asm b/lzo/asm/i386/src_nasm/lzo1f_f2.asm
index e0de429..70d6f36 100644
--- a/lzo/asm/i386/src_nasm/lzo1f_f2.asm
+++ b/lzo/asm/i386/src_nasm/lzo1f_f2.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1f_decompress_asm_fast_safe)
-globalf(F(lzo1f_decompress_asm_fast_safe))
-_lzo1f_decompress_asm_fast_safe:
-F(lzo1f_decompress_asm_fast_safe):
+%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
@@ -71,3 +82,9 @@ 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/lzo/asm/i386/src_nasm/lzo1x_f1.asm b/lzo/asm/i386/src_nasm/lzo1x_f1.asm
index 23a18fe..a54585f 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_f1.asm
+++ b/lzo/asm/i386/src_nasm/lzo1x_f1.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1x_decompress_asm_fast)
-globalf(F(lzo1x_decompress_asm_fast))
-_lzo1x_decompress_asm_fast:
-F(lzo1x_decompress_asm_fast):
+%ifdef NAME1
+globalf(NAME1(lzo1x_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1x_decompress_asm_fast))
+%endif
+%ifdef NAME1
+NAME1(lzo1x_decompress_asm_fast):
+%endif
+%ifdef NAME2
+NAME2(lzo1x_decompress_asm_fast):
+%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,49,192,49,219,172,60,17,118,27
 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244
@@ -72,3 +83,9 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214
 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216
 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235
 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144
+%ifdef NAME1
+globalf_end(NAME1(lzo1x_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1x_decompress_asm_fast))
+%endif
diff --git a/lzo/asm/i386/src_nasm/lzo1x_f2.asm b/lzo/asm/i386/src_nasm/lzo1x_f2.asm
index e41de81..ada1b88 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_f2.asm
+++ b/lzo/asm/i386/src_nasm/lzo1x_f2.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1x_decompress_asm_fast_safe)
-globalf(F(lzo1x_decompress_asm_fast_safe))
-_lzo1x_decompress_asm_fast_safe:
-F(lzo1x_decompress_asm_fast_safe):
+%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
@@ -87,3 +98,9 @@ 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/lzo/asm/i386/src_nasm/lzo1x_s1.asm b/lzo/asm/i386/src_nasm/lzo1x_s1.asm
index f41f7f9..00d4f4e 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_s1.asm
+++ b/lzo/asm/i386/src_nasm/lzo1x_s1.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1x_decompress_asm)
-globalf(F(lzo1x_decompress_asm))
-_lzo1x_decompress_asm:
-F(lzo1x_decompress_asm):
+%ifdef NAME1
+globalf(NAME1(lzo1x_decompress_asm))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1x_decompress_asm))
+%endif
+%ifdef NAME1
+NAME1(lzo1x_decompress_asm):
+%endif
+%ifdef NAME2
+NAME2(lzo1x_decompress_asm):
+%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,49,192,49,219,172,60,17,118,35
 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138
@@ -74,3 +85,9 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48
 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95
 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220
 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1x_decompress_asm))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1x_decompress_asm))
+%endif
diff --git a/lzo/asm/i386/src_nasm/lzo1x_s2.asm b/lzo/asm/i386/src_nasm/lzo1x_s2.asm
index 7b3acc4..5c65558 100644
--- a/lzo/asm/i386/src_nasm/lzo1x_s2.asm
+++ b/lzo/asm/i386/src_nasm/lzo1x_s2.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1x_decompress_asm_safe)
-globalf(F(lzo1x_decompress_asm_safe))
-_lzo1x_decompress_asm_safe:
-F(lzo1x_decompress_asm_safe):
+%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
@@ -90,3 +101,9 @@ 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/lzo/asm/i386/src_nasm/lzo1y_f1.asm b/lzo/asm/i386/src_nasm/lzo1y_f1.asm
index c423de3..1c42cda 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_f1.asm
+++ b/lzo/asm/i386/src_nasm/lzo1y_f1.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1y_decompress_asm_fast)
-globalf(F(lzo1y_decompress_asm_fast))
-_lzo1y_decompress_asm_fast:
-F(lzo1y_decompress_asm_fast):
+%ifdef NAME1
+globalf(NAME1(lzo1y_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1y_decompress_asm_fast))
+%endif
+%ifdef NAME1
+NAME1(lzo1y_decompress_asm_fast):
+%endif
+%ifdef NAME2
+NAME2(lzo1y_decompress_asm_fast):
+%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,49,192,49,219,172,60,17,118,27
 db 44,14,235,34,5,255,0,0,0,138,30,70,8,219,116,244
@@ -72,3 +83,9 @@ db 131,249,6,15,149,192,139,84,36,40,3,84,36,44,57,214
 db 119,38,114,29,43,124,36,48,139,84,36,52,137,58,247,216
 db 131,196,12,90,89,91,94,95,93,195,184,1,0,0,0,235
 db 227,184,8,0,0,0,235,220,184,4,0,0,0,235,213,144
+%ifdef NAME1
+globalf_end(NAME1(lzo1y_decompress_asm_fast))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1y_decompress_asm_fast))
+%endif
diff --git a/lzo/asm/i386/src_nasm/lzo1y_f2.asm b/lzo/asm/i386/src_nasm/lzo1y_f2.asm
index 3864444..9e6b37c 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_f2.asm
+++ b/lzo/asm/i386/src_nasm/lzo1y_f2.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1y_decompress_asm_fast_safe)
-globalf(F(lzo1y_decompress_asm_fast_safe))
-_lzo1y_decompress_asm_fast_safe:
-F(lzo1y_decompress_asm_fast_safe):
+%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
@@ -87,3 +98,9 @@ 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/lzo/asm/i386/src_nasm/lzo1y_s1.asm b/lzo/asm/i386/src_nasm/lzo1y_s1.asm
index 902f5a9..f7e4278 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_s1.asm
+++ b/lzo/asm/i386/src_nasm/lzo1y_s1.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1y_decompress_asm)
-globalf(F(lzo1y_decompress_asm))
-_lzo1y_decompress_asm:
-F(lzo1y_decompress_asm):
+%ifdef NAME1
+globalf(NAME1(lzo1y_decompress_asm))
+%endif
+%ifdef NAME2
+globalf(NAME2(lzo1y_decompress_asm))
+%endif
+%ifdef NAME1
+NAME1(lzo1y_decompress_asm):
+%endif
+%ifdef NAME2
+NAME2(lzo1y_decompress_asm):
+%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,49,192,49,219,172,60,17,118,35
 db 44,17,60,4,115,40,137,193,235,56,5,255,0,0,0,138
@@ -74,3 +85,9 @@ db 36,40,3,84,36,44,57,214,119,38,114,29,43,124,36,48
 db 139,84,36,52,137,58,247,216,131,196,12,90,89,91,94,95
 db 93,195,184,1,0,0,0,235,227,184,8,0,0,0,235,220
 db 184,4,0,0,0,235,213,137,246,141,188,39,0,0,0,0
+%ifdef NAME1
+globalf_end(NAME1(lzo1y_decompress_asm))
+%endif
+%ifdef NAME2
+globalf_end(NAME2(lzo1y_decompress_asm))
+%endif
diff --git a/lzo/asm/i386/src_nasm/lzo1y_s2.asm b/lzo/asm/i386/src_nasm/lzo1y_s2.asm
index 72224e8..065508c 100644
--- a/lzo/asm/i386/src_nasm/lzo1y_s2.asm
+++ b/lzo/asm/i386/src_nasm/lzo1y_s2.asm
@@ -2,6 +2,9 @@
 ;
 ;  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
@@ -40,10 +43,18 @@
 ; /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 %include "asminit.def"
-globalf(_lzo1y_decompress_asm_safe)
-globalf(F(lzo1y_decompress_asm_safe))
-_lzo1y_decompress_asm_safe:
-F(lzo1y_decompress_asm_safe):
+%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
@@ -90,3 +101,9 @@ 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