From 6a4ba5d3976f6d219400a46c634dd479bc5981a5 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 2 Jul 2012 17:28:05 +0200
Subject: Update lzo version

---
 lzo/asm/i386/src_gas/asminit.def | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'lzo/asm/i386/src_gas/asminit.def')

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)
-- 
cgit v1.2.3

