summaryrefslogtreecommitdiff
path: root/lzo/asm/i386/src_nasm/asminit.def
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-07-02 21:42:07 +0200
committerArne Schwabe <arne@rfc2549.org>2012-07-02 21:42:07 +0200
commit21c3e54010129b504891e1786bf425d89328c969 (patch)
tree2e3eba26f5f0fa454188e1b52c7cab3761c4f208 /lzo/asm/i386/src_nasm/asminit.def
parentd4a1b52faa85df4446560a48c6bcc57f016e0c3c (diff)
parentb42eacfa8da0a642d629714f188cc0fc4c7e601a (diff)
Merge
Diffstat (limited to 'lzo/asm/i386/src_nasm/asminit.def')
-rw-r--r--lzo/asm/i386/src_nasm/asminit.def32
1 files changed, 29 insertions, 3 deletions
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