From ace5e90b3dbc33f0fc34ac2f3dc40d3c990a6a11 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_nasm/asminit.def | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

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

diff --git a/lzo/asm/i386/src_nasm/asminit.def b/lzo/asm/i386/src_nasm/asminit.def
index 6942a816..3f2e0d6e 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
-- 
cgit v1.2.3

