Update lzo version

14 files changed, 665 insertions, 224 deletions

diff --git a/lzo/asm/i386/src_gas/all/asm_all.S b/lzo/asm/i386/src_gas/all/asm_all.S
index d8dd80d7..cb859427 100644
--- a/lzo/asm/i386/src_gas/all/asm_all.S
+++ b/lzo/asm/i386/src_gas/all/asm_all.S
@@ -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
@@ -35,28 +38,34 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
-#ifndef F
-#  define F(name)       name
+#if defined(__MACH__) && defined(__APPLE__)
+#  define NAME1(x)      _ ## x
+#else
+#  define NAME1(x)      _ ## x
+#  define NAME2(x)           x
 #endif
-#ifndef global
-#  define global(x)     .globl x
+#ifndef p2align
+#  define p2align(x)    .p2align x
+#endif
+#ifndef globalf
+#  define globalf(x)    .globl x
 #endif
 #ifndef typef
-#  ifdef __ELF__
+#  if defined(__ELF__)
 #    define typef(x)    .type x,@function
 #  else
 #    define typef(x)
 #  endif
 #endif
-#ifndef size
-#  ifdef __ELF__
-#    define size(x,s)   .size x,s
+#ifndef sizef
+#  if defined(__ELF__)
+#    define sizef(x,s)  .size x,s
 #  else
-#    define size(x,s)
+#    define sizef(x,s)
 #  endif
 #endif
 #ifndef db
@@ -66,13 +75,26 @@
 .section .note.GNU-stack,"",@progbits
 #endif
 .text
+p2align(4)
 
-typef(_lzo1c_decompress_asm)
-typef(F(lzo1c_decompress_asm))
-global(_lzo1c_decompress_asm)
-global(F(lzo1c_decompress_asm))
-_lzo1c_decompress_asm:
-F(lzo1c_decompress_asm):
+#ifdef NAME1
+typef(NAME1(lzo1c_decompress_asm))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1c_decompress_asm))
+#endif
+#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
@@ -91,15 +113,31 @@ 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
-size(_lzo1c_decompress_asm,.-_lzo1c_decompress_asm)
-size(F(lzo1c_decompress_asm),.-F(lzo1c_decompress_asm))
+#ifdef NAME1
+sizef(NAME1(lzo1c_decompress_asm),.-NAME1(lzo1c_decompress_asm))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1c_decompress_asm),.-NAME2(lzo1c_decompress_asm))
+#endif
 
-typef(_lzo1c_decompress_asm_safe)
-typef(F(lzo1c_decompress_asm_safe))
-global(_lzo1c_decompress_asm_safe)
-global(F(lzo1c_decompress_asm_safe))
-_lzo1c_decompress_asm_safe:
-F(lzo1c_decompress_asm_safe):
+#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
@@ -129,15 +167,31 @@ 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
-size(_lzo1c_decompress_asm_safe,.-_lzo1c_decompress_asm_safe)
-size(F(lzo1c_decompress_asm_safe),.-F(lzo1c_decompress_asm_safe))
+#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
 
-typef(_lzo1f_decompress_asm_fast)
-typef(F(lzo1f_decompress_asm_fast))
-global(_lzo1f_decompress_asm_fast)
-global(F(lzo1f_decompress_asm_fast))
-_lzo1f_decompress_asm_fast:
-F(lzo1f_decompress_asm_fast):
+#ifdef NAME1
+typef(NAME1(lzo1f_decompress_asm_fast))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1f_decompress_asm_fast))
+#endif
+#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
@@ -158,15 +212,31 @@ 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
-size(_lzo1f_decompress_asm_fast,.-_lzo1f_decompress_asm_fast)
-size(F(lzo1f_decompress_asm_fast),.-F(lzo1f_decompress_asm_fast))
+#ifdef NAME1
+sizef(NAME1(lzo1f_decompress_asm_fast),.-NAME1(lzo1f_decompress_asm_fast))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1f_decompress_asm_fast),.-NAME2(lzo1f_decompress_asm_fast))
+#endif
 
-typef(_lzo1f_decompress_asm_fast_safe)
-typef(F(lzo1f_decompress_asm_fast_safe))
-global(_lzo1f_decompress_asm_fast_safe)
-global(F(lzo1f_decompress_asm_fast_safe))
-_lzo1f_decompress_asm_fast_safe:
-F(lzo1f_decompress_asm_fast_safe):
+#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
@@ -194,15 +264,31 @@ 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
-size(_lzo1f_decompress_asm_fast_safe,.-_lzo1f_decompress_asm_fast_safe)
-size(F(lzo1f_decompress_asm_fast_safe),.-F(lzo1f_decompress_asm_fast_safe))
+#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
 
-typef(_lzo1x_decompress_asm_fast)
-typef(F(lzo1x_decompress_asm_fast))
-global(_lzo1x_decompress_asm_fast)
-global(F(lzo1x_decompress_asm_fast))
-_lzo1x_decompress_asm_fast:
-F(lzo1x_decompress_asm_fast):
+#ifdef NAME1
+typef(NAME1(lzo1x_decompress_asm_fast))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1x_decompress_asm_fast))
+#endif
+#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
@@ -231,15 +317,31 @@ 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
-size(_lzo1x_decompress_asm_fast,.-_lzo1x_decompress_asm_fast)
-size(F(lzo1x_decompress_asm_fast),.-F(lzo1x_decompress_asm_fast))
+#ifdef NAME1
+sizef(NAME1(lzo1x_decompress_asm_fast),.-NAME1(lzo1x_decompress_asm_fast))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1x_decompress_asm_fast),.-NAME2(lzo1x_decompress_asm_fast))
+#endif
 
-typef(_lzo1x_decompress_asm_fast_safe)
-typef(F(lzo1x_decompress_asm_fast_safe))
-global(_lzo1x_decompress_asm_fast_safe)
-global(F(lzo1x_decompress_asm_fast_safe))
-_lzo1x_decompress_asm_fast_safe:
-F(lzo1x_decompress_asm_fast_safe):
+#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
@@ -283,15 +385,31 @@ 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
-size(_lzo1x_decompress_asm_fast_safe,.-_lzo1x_decompress_asm_fast_safe)
-size(F(lzo1x_decompress_asm_fast_safe),.-F(lzo1x_decompress_asm_fast_safe))
+#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
 
-typef(_lzo1x_decompress_asm)
-typef(F(lzo1x_decompress_asm))
-global(_lzo1x_decompress_asm)
-global(F(lzo1x_decompress_asm))
-_lzo1x_decompress_asm:
-F(lzo1x_decompress_asm):
+#ifdef NAME1
+typef(NAME1(lzo1x_decompress_asm))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1x_decompress_asm))
+#endif
+#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
@@ -322,15 +440,31 @@ 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
-size(_lzo1x_decompress_asm,.-_lzo1x_decompress_asm)
-size(F(lzo1x_decompress_asm),.-F(lzo1x_decompress_asm))
+#ifdef NAME1
+sizef(NAME1(lzo1x_decompress_asm),.-NAME1(lzo1x_decompress_asm))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1x_decompress_asm),.-NAME2(lzo1x_decompress_asm))
+#endif
 
-typef(_lzo1x_decompress_asm_safe)
-typef(F(lzo1x_decompress_asm_safe))
-global(_lzo1x_decompress_asm_safe)
-global(F(lzo1x_decompress_asm_safe))
-_lzo1x_decompress_asm_safe:
-F(lzo1x_decompress_asm_safe):
+#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
@@ -377,15 +511,31 @@ 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
-size(_lzo1x_decompress_asm_safe,.-_lzo1x_decompress_asm_safe)
-size(F(lzo1x_decompress_asm_safe),.-F(lzo1x_decompress_asm_safe))
+#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
 
-typef(_lzo1y_decompress_asm_fast)
-typef(F(lzo1y_decompress_asm_fast))
-global(_lzo1y_decompress_asm_fast)
-global(F(lzo1y_decompress_asm_fast))
-_lzo1y_decompress_asm_fast:
-F(lzo1y_decompress_asm_fast):
+#ifdef NAME1
+typef(NAME1(lzo1y_decompress_asm_fast))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1y_decompress_asm_fast))
+#endif
+#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
@@ -414,15 +564,31 @@ 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
-size(_lzo1y_decompress_asm_fast,.-_lzo1y_decompress_asm_fast)
-size(F(lzo1y_decompress_asm_fast),.-F(lzo1y_decompress_asm_fast))
+#ifdef NAME1
+sizef(NAME1(lzo1y_decompress_asm_fast),.-NAME1(lzo1y_decompress_asm_fast))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1y_decompress_asm_fast),.-NAME2(lzo1y_decompress_asm_fast))
+#endif
 
-typef(_lzo1y_decompress_asm_fast_safe)
-typef(F(lzo1y_decompress_asm_fast_safe))
-global(_lzo1y_decompress_asm_fast_safe)
-global(F(lzo1y_decompress_asm_fast_safe))
-_lzo1y_decompress_asm_fast_safe:
-F(lzo1y_decompress_asm_fast_safe):
+#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
@@ -466,15 +632,31 @@ 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
-size(_lzo1y_decompress_asm_fast_safe,.-_lzo1y_decompress_asm_fast_safe)
-size(F(lzo1y_decompress_asm_fast_safe),.-F(lzo1y_decompress_asm_fast_safe))
+#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
 
-typef(_lzo1y_decompress_asm)
-typef(F(lzo1y_decompress_asm))
-global(_lzo1y_decompress_asm)
-global(F(lzo1y_decompress_asm))
-_lzo1y_decompress_asm:
-F(lzo1y_decompress_asm):
+#ifdef NAME1
+typef(NAME1(lzo1y_decompress_asm))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1y_decompress_asm))
+#endif
+#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
@@ -505,15 +687,31 @@ 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
-size(_lzo1y_decompress_asm,.-_lzo1y_decompress_asm)
-size(F(lzo1y_decompress_asm),.-F(lzo1y_decompress_asm))
+#ifdef NAME1
+sizef(NAME1(lzo1y_decompress_asm),.-NAME1(lzo1y_decompress_asm))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1y_decompress_asm),.-NAME2(lzo1y_decompress_asm))
+#endif
 
-typef(_lzo1y_decompress_asm_safe)
-typef(F(lzo1y_decompress_asm_safe))
-global(_lzo1y_decompress_asm_safe)
-global(F(lzo1y_decompress_asm_safe))
-_lzo1y_decompress_asm_safe:
-F(lzo1y_decompress_asm_safe):
+#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
@@ -560,6 +758,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
-size(_lzo1y_decompress_asm_safe,.-_lzo1y_decompress_asm_safe)
-size(F(lzo1y_decompress_asm_safe),.-F(lzo1y_decompress_asm_safe))
+#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/lzo/asm/i386/src_gas/asminit.def b/lzo/asm/i386/src_gas/asminit.def
index 942b7b3c..154b8a52 100644
--- a/lzo/asm/i386/src_gas/asminit.def
+++ b/lzo/asm/i386/src_gas/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
@@ -35,26 +38,33 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
-#ifndef F
-#  define F(name)       name
+#if defined(__MACH__) && defined(__APPLE__)
+#  define NAME1(x)      _ ## x
+#else
+#  define NAME1(x)      _ ## x
+#  define NAME2(x)           x
 #endif
-#ifndef global
-#  define global(x)     .globl x
+
+#ifndef p2align
+#  define p2align(x)    .p2align x
+#endif
+#ifndef globalf
+#  define globalf(x)    .globl x
 #endif
 #ifndef typef
-#  ifdef __ELF__
+#  if defined(__ELF__)
 #    define typef(x)    .type x,@function
 #  else
 #    define typef(x)
 #  endif
 #endif
-#ifndef size
-#  ifdef __ELF__
-#    define size(x,s)   .size x,s
+#ifndef sizef
+#  if defined(__ELF__)
+#    define sizef(x,s)  .size x,s
 #  else
-#    define size(x,s)
+#    define sizef(x,s)
 #  endif
 #endif
 #ifndef db
@@ -65,3 +75,4 @@
 .section .note.GNU-stack,"",@progbits
 #endif
 .text
+p2align(4)
diff --git a/lzo/asm/i386/src_gas/lzo1c_s1.S b/lzo/asm/i386/src_gas/lzo1c_s1.S
index 3db16c1c..8b01a3b0 100644
--- a/lzo/asm/i386/src_gas/lzo1c_s1.S
+++ b/lzo/asm/i386/src_gas/lzo1c_s1.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1c_decompress_asm)
-typef(F(lzo1c_decompress_asm))
-global(_lzo1c_decompress_asm)
-global(F(lzo1c_decompress_asm))
-_lzo1c_decompress_asm:
-F(lzo1c_decompress_asm):
+#ifdef NAME1
+typef(NAME1(lzo1c_decompress_asm))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1c_decompress_asm))
+#endif
+#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
@@ -64,5 +79,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
-size(_lzo1c_decompress_asm,.-_lzo1c_decompress_asm)
-size(F(lzo1c_decompress_asm),.-F(lzo1c_decompress_asm))
+#ifdef NAME1
+sizef(NAME1(lzo1c_decompress_asm),.-NAME1(lzo1c_decompress_asm))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1c_decompress_asm),.-NAME2(lzo1c_decompress_asm))
+#endif
diff --git a/lzo/asm/i386/src_gas/lzo1c_s2.S b/lzo/asm/i386/src_gas/lzo1c_s2.S
index 91213b98..1797cc34 100644
--- a/lzo/asm/i386/src_gas/lzo1c_s2.S
+++ b/lzo/asm/i386/src_gas/lzo1c_s2.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1c_decompress_asm_safe)
-typef(F(lzo1c_decompress_asm_safe))
-global(_lzo1c_decompress_asm_safe)
-global(F(lzo1c_decompress_asm_safe))
-_lzo1c_decompress_asm_safe:
-F(lzo1c_decompress_asm_safe):
+#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
@@ -75,5 +90,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
-size(_lzo1c_decompress_asm_safe,.-_lzo1c_decompress_asm_safe)
-size(F(lzo1c_decompress_asm_safe),.-F(lzo1c_decompress_asm_safe))
+#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/lzo/asm/i386/src_gas/lzo1f_f1.S b/lzo/asm/i386/src_gas/lzo1f_f1.S
index 0020839c..e3f5ccf8 100644
--- a/lzo/asm/i386/src_gas/lzo1f_f1.S
+++ b/lzo/asm/i386/src_gas/lzo1f_f1.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1f_decompress_asm_fast)
-typef(F(lzo1f_decompress_asm_fast))
-global(_lzo1f_decompress_asm_fast)
-global(F(lzo1f_decompress_asm_fast))
-_lzo1f_decompress_asm_fast:
-F(lzo1f_decompress_asm_fast):
+#ifdef NAME1
+typef(NAME1(lzo1f_decompress_asm_fast))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1f_decompress_asm_fast))
+#endif
+#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
@@ -66,5 +81,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
-size(_lzo1f_decompress_asm_fast,.-_lzo1f_decompress_asm_fast)
-size(F(lzo1f_decompress_asm_fast),.-F(lzo1f_decompress_asm_fast))
+#ifdef NAME1
+sizef(NAME1(lzo1f_decompress_asm_fast),.-NAME1(lzo1f_decompress_asm_fast))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1f_decompress_asm_fast),.-NAME2(lzo1f_decompress_asm_fast))
+#endif
diff --git a/lzo/asm/i386/src_gas/lzo1f_f2.S b/lzo/asm/i386/src_gas/lzo1f_f2.S
index 0c721049..f2041bc7 100644
--- a/lzo/asm/i386/src_gas/lzo1f_f2.S
+++ b/lzo/asm/i386/src_gas/lzo1f_f2.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1f_decompress_asm_fast_safe)
-typef(F(lzo1f_decompress_asm_fast_safe))
-global(_lzo1f_decompress_asm_fast_safe)
-global(F(lzo1f_decompress_asm_fast_safe))
-_lzo1f_decompress_asm_fast_safe:
-F(lzo1f_decompress_asm_fast_safe):
+#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
@@ -73,5 +88,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
-size(_lzo1f_decompress_asm_fast_safe,.-_lzo1f_decompress_asm_fast_safe)
-size(F(lzo1f_decompress_asm_fast_safe),.-F(lzo1f_decompress_asm_fast_safe))
+#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/lzo/asm/i386/src_gas/lzo1x_f1.S b/lzo/asm/i386/src_gas/lzo1x_f1.S
index 4137f899..26f42e91 100644
--- a/lzo/asm/i386/src_gas/lzo1x_f1.S
+++ b/lzo/asm/i386/src_gas/lzo1x_f1.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1x_decompress_asm_fast)
-typef(F(lzo1x_decompress_asm_fast))
-global(_lzo1x_decompress_asm_fast)
-global(F(lzo1x_decompress_asm_fast))
-_lzo1x_decompress_asm_fast:
-F(lzo1x_decompress_asm_fast):
+#ifdef NAME1
+typef(NAME1(lzo1x_decompress_asm_fast))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1x_decompress_asm_fast))
+#endif
+#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
@@ -74,5 +89,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
-size(_lzo1x_decompress_asm_fast,.-_lzo1x_decompress_asm_fast)
-size(F(lzo1x_decompress_asm_fast),.-F(lzo1x_decompress_asm_fast))
+#ifdef NAME1
+sizef(NAME1(lzo1x_decompress_asm_fast),.-NAME1(lzo1x_decompress_asm_fast))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1x_decompress_asm_fast),.-NAME2(lzo1x_decompress_asm_fast))
+#endif
diff --git a/lzo/asm/i386/src_gas/lzo1x_f2.S b/lzo/asm/i386/src_gas/lzo1x_f2.S
index eb3a744c..0ded30ee 100644
--- a/lzo/asm/i386/src_gas/lzo1x_f2.S
+++ b/lzo/asm/i386/src_gas/lzo1x_f2.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1x_decompress_asm_fast_safe)
-typef(F(lzo1x_decompress_asm_fast_safe))
-global(_lzo1x_decompress_asm_fast_safe)
-global(F(lzo1x_decompress_asm_fast_safe))
-_lzo1x_decompress_asm_fast_safe:
-F(lzo1x_decompress_asm_fast_safe):
+#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
@@ -89,5 +104,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
-size(_lzo1x_decompress_asm_fast_safe,.-_lzo1x_decompress_asm_fast_safe)
-size(F(lzo1x_decompress_asm_fast_safe),.-F(lzo1x_decompress_asm_fast_safe))
+#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/lzo/asm/i386/src_gas/lzo1x_s1.S b/lzo/asm/i386/src_gas/lzo1x_s1.S
index 28095c6b..a18a7319 100644
--- a/lzo/asm/i386/src_gas/lzo1x_s1.S
+++ b/lzo/asm/i386/src_gas/lzo1x_s1.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1x_decompress_asm)
-typef(F(lzo1x_decompress_asm))
-global(_lzo1x_decompress_asm)
-global(F(lzo1x_decompress_asm))
-_lzo1x_decompress_asm:
-F(lzo1x_decompress_asm):
+#ifdef NAME1
+typef(NAME1(lzo1x_decompress_asm))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1x_decompress_asm))
+#endif
+#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
@@ -76,5 +91,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
-size(_lzo1x_decompress_asm,.-_lzo1x_decompress_asm)
-size(F(lzo1x_decompress_asm),.-F(lzo1x_decompress_asm))
+#ifdef NAME1
+sizef(NAME1(lzo1x_decompress_asm),.-NAME1(lzo1x_decompress_asm))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1x_decompress_asm),.-NAME2(lzo1x_decompress_asm))
+#endif
diff --git a/lzo/asm/i386/src_gas/lzo1x_s2.S b/lzo/asm/i386/src_gas/lzo1x_s2.S
index 33e15258..46d60aa0 100644
--- a/lzo/asm/i386/src_gas/lzo1x_s2.S
+++ b/lzo/asm/i386/src_gas/lzo1x_s2.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1x_decompress_asm_safe)
-typef(F(lzo1x_decompress_asm_safe))
-global(_lzo1x_decompress_asm_safe)
-global(F(lzo1x_decompress_asm_safe))
-_lzo1x_decompress_asm_safe:
-F(lzo1x_decompress_asm_safe):
+#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
@@ -92,5 +107,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
-size(_lzo1x_decompress_asm_safe,.-_lzo1x_decompress_asm_safe)
-size(F(lzo1x_decompress_asm_safe),.-F(lzo1x_decompress_asm_safe))
+#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/lzo/asm/i386/src_gas/lzo1y_f1.S b/lzo/asm/i386/src_gas/lzo1y_f1.S
index 28b4826a..e13fd08d 100644
--- a/lzo/asm/i386/src_gas/lzo1y_f1.S
+++ b/lzo/asm/i386/src_gas/lzo1y_f1.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1y_decompress_asm_fast)
-typef(F(lzo1y_decompress_asm_fast))
-global(_lzo1y_decompress_asm_fast)
-global(F(lzo1y_decompress_asm_fast))
-_lzo1y_decompress_asm_fast:
-F(lzo1y_decompress_asm_fast):
+#ifdef NAME1
+typef(NAME1(lzo1y_decompress_asm_fast))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1y_decompress_asm_fast))
+#endif
+#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
@@ -74,5 +89,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
-size(_lzo1y_decompress_asm_fast,.-_lzo1y_decompress_asm_fast)
-size(F(lzo1y_decompress_asm_fast),.-F(lzo1y_decompress_asm_fast))
+#ifdef NAME1
+sizef(NAME1(lzo1y_decompress_asm_fast),.-NAME1(lzo1y_decompress_asm_fast))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1y_decompress_asm_fast),.-NAME2(lzo1y_decompress_asm_fast))
+#endif
diff --git a/lzo/asm/i386/src_gas/lzo1y_f2.S b/lzo/asm/i386/src_gas/lzo1y_f2.S
index d95b2c38..de28ace9 100644
--- a/lzo/asm/i386/src_gas/lzo1y_f2.S
+++ b/lzo/asm/i386/src_gas/lzo1y_f2.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1y_decompress_asm_fast_safe)
-typef(F(lzo1y_decompress_asm_fast_safe))
-global(_lzo1y_decompress_asm_fast_safe)
-global(F(lzo1y_decompress_asm_fast_safe))
-_lzo1y_decompress_asm_fast_safe:
-F(lzo1y_decompress_asm_fast_safe):
+#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
@@ -89,5 +104,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
-size(_lzo1y_decompress_asm_fast_safe,.-_lzo1y_decompress_asm_fast_safe)
-size(F(lzo1y_decompress_asm_fast_safe),.-F(lzo1y_decompress_asm_fast_safe))
+#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/lzo/asm/i386/src_gas/lzo1y_s1.S b/lzo/asm/i386/src_gas/lzo1y_s1.S
index 65528017..269955b0 100644
--- a/lzo/asm/i386/src_gas/lzo1y_s1.S
+++ b/lzo/asm/i386/src_gas/lzo1y_s1.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1y_decompress_asm)
-typef(F(lzo1y_decompress_asm))
-global(_lzo1y_decompress_asm)
-global(F(lzo1y_decompress_asm))
-_lzo1y_decompress_asm:
-F(lzo1y_decompress_asm):
+#ifdef NAME1
+typef(NAME1(lzo1y_decompress_asm))
+#endif
+#ifdef NAME2
+typef(NAME2(lzo1y_decompress_asm))
+#endif
+#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
@@ -76,5 +91,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
-size(_lzo1y_decompress_asm,.-_lzo1y_decompress_asm)
-size(F(lzo1y_decompress_asm),.-F(lzo1y_decompress_asm))
+#ifdef NAME1
+sizef(NAME1(lzo1y_decompress_asm),.-NAME1(lzo1y_decompress_asm))
+#endif
+#ifdef NAME2
+sizef(NAME2(lzo1y_decompress_asm),.-NAME2(lzo1y_decompress_asm))
+#endif
diff --git a/lzo/asm/i386/src_gas/lzo1y_s2.S b/lzo/asm/i386/src_gas/lzo1y_s2.S
index 6682c490..4da81a3c 100644
--- a/lzo/asm/i386/src_gas/lzo1y_s2.S
+++ b/lzo/asm/i386/src_gas/lzo1y_s2.S
@@ -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
@@ -35,17 +38,29 @@
    Markus F.X.J. Oberhumer
    <markus@oberhumer.com>
    http://www.oberhumer.com/opensource/lzo/
-*/
+ */
 
 /***** DO NOT EDIT - GENERATED AUTOMATICALLY *****/
 
 #include "asminit.def"
-typef(_lzo1y_decompress_asm_safe)
-typef(F(lzo1y_decompress_asm_safe))
-global(_lzo1y_decompress_asm_safe)
-global(F(lzo1y_decompress_asm_safe))
-_lzo1y_decompress_asm_safe:
-F(lzo1y_decompress_asm_safe):
+#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
@@ -92,5 +107,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
-size(_lzo1y_decompress_asm_safe,.-_lzo1y_decompress_asm_safe)
-size(F(lzo1y_decompress_asm_safe),.-F(lzo1y_decompress_asm_safe))
+#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