summaryrefslogtreecommitdiff
path: root/asm/i386/src_nasm
diff options
context:
space:
mode:
Diffstat (limited to 'asm/i386/src_nasm')
-rw-r--r--asm/i386/src_nasm/all/asm_all.asm45
-rw-r--r--asm/i386/src_nasm/asminit.def48
-rw-r--r--asm/i386/src_nasm/lzo1c_s1.asm2
-rw-r--r--asm/i386/src_nasm/lzo1f_f1.asm2
-rw-r--r--asm/i386/src_nasm/lzo1x_f1.asm2
-rw-r--r--asm/i386/src_nasm/lzo1x_s1.asm2
-rw-r--r--asm/i386/src_nasm/lzo1y_f1.asm2
-rw-r--r--asm/i386/src_nasm/lzo1y_s1.asm2
8 files changed, 75 insertions, 30 deletions
diff --git a/asm/i386/src_nasm/all/asm_all.asm b/asm/i386/src_nasm/all/asm_all.asm
index b0df7de..87260c0 100644
--- a/asm/i386/src_nasm/all/asm_all.asm
+++ b/asm/i386/src_nasm/all/asm_all.asm
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
@@ -49,23 +49,44 @@ bits 32
%define __OUTPUT_FORMAT__ win64
%endif
%endif
-%ifidni __OUTPUT_FORMAT__,macho32
-%define NAME1(x) _ %+ x
+%ifndef NAME1
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a) a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a) a
+%elifidni __OUTPUT_FORMAT__,macho32
+%define NAME1(a) _ %+ a
%elifidni __OUTPUT_FORMAT__,macho64
-%define NAME1(x) _ %+ x
+%define NAME1(a) _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a) _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a) a
%else
-%define NAME1(x) _ %+ x
-%define NAME2(x) x
+%define NAME1(a) _ %+ a
+%define NAME2(a) a
+%endif
%endif
%ifidni __OUTPUT_FORMAT__,elf32
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%elifidni __OUTPUT_FORMAT__,elf64
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%else
-%define globalf(x) global x
-%define globalf_end(x)
+%define globalf(a) global a
+%define globalfh(a) global a
+%define globalf_end(a)
+%endif
+%ifndef LZO_SEH_EXCEPTIONS
+%ifidni __OUTPUT_FORMAT__,win64
+%define LZO_SEH_EXCEPTIONS 1
+%endif
+%endif
+%ifndef LZO_SEH_EXCEPTIONS
+%define LZO_SEH_EXCEPTIONS 0
%endif
%ifidni __OUTPUT_FORMAT__,elf32
section .note.GNU-stack noalloc noexec nowrite progbits
diff --git a/asm/i386/src_nasm/asminit.def b/asm/i386/src_nasm/asminit.def
index 0ccdb8d..db792af 100644
--- a/asm/i386/src_nasm/asminit.def
+++ b/asm/i386/src_nasm/asminit.def
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
@@ -48,24 +48,48 @@ bits 32
%endif
%endif
-%ifidni __OUTPUT_FORMAT__,macho32
-%define NAME1(x) _ %+ x
+%ifndef NAME1
+%ifidni __OUTPUT_FORMAT__,elf32
+%define NAME1(a) a
+%elifidni __OUTPUT_FORMAT__,elf64
+%define NAME1(a) a
+%elifidni __OUTPUT_FORMAT__,macho32
+%define NAME1(a) _ %+ a
%elifidni __OUTPUT_FORMAT__,macho64
-%define NAME1(x) _ %+ x
+%define NAME1(a) _ %+ a
+%elifidni __OUTPUT_FORMAT__,win32
+%define NAME1(a) _ %+ a
+%elifidni __OUTPUT_FORMAT__,win64
+%define NAME1(a) a
%else
-%define NAME1(x) _ %+ x
-%define NAME2(x) x
+%define NAME1(a) _ %+ a
+%define NAME2(a) a
+%endif
%endif
%ifidni __OUTPUT_FORMAT__,elf32
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+;define globalfh(a) global a:function hidden
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%elifidni __OUTPUT_FORMAT__,elf64
-%define globalf(x) global x:function (x %+ _end - x)
-%define globalf_end(x) x %+ _end:
+%define globalf(a) global a:function (a %+ _end - a)
+;define globalfh(a) global a:function hidden
+%define globalfh(a) global a:function hidden (a %+ _end - a)
+%define globalf_end(a) a %+ _end:
%else
-%define globalf(x) global x
-%define globalf_end(x)
+%define globalf(a) global a
+%define globalfh(a) global a
+%define globalf_end(a)
+%endif
+
+%ifndef LZO_SEH_EXCEPTIONS
+%ifidni __OUTPUT_FORMAT__,win64
+%define LZO_SEH_EXCEPTIONS 1
+%endif
+%endif
+%ifndef LZO_SEH_EXCEPTIONS
+%define LZO_SEH_EXCEPTIONS 0
%endif
%ifidni __OUTPUT_FORMAT__,elf32
diff --git a/asm/i386/src_nasm/lzo1c_s1.asm b/asm/i386/src_nasm/lzo1c_s1.asm
index e35e627..cb408e0 100644
--- a/asm/i386/src_nasm/lzo1c_s1.asm
+++ b/asm/i386/src_nasm/lzo1c_s1.asm
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1f_f1.asm b/asm/i386/src_nasm/lzo1f_f1.asm
index 514ab47..ebad1fd 100644
--- a/asm/i386/src_nasm/lzo1f_f1.asm
+++ b/asm/i386/src_nasm/lzo1f_f1.asm
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1x_f1.asm b/asm/i386/src_nasm/lzo1x_f1.asm
index 585963b..e559474 100644
--- a/asm/i386/src_nasm/lzo1x_f1.asm
+++ b/asm/i386/src_nasm/lzo1x_f1.asm
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1x_s1.asm b/asm/i386/src_nasm/lzo1x_s1.asm
index 98790b9..cd4cb71 100644
--- a/asm/i386/src_nasm/lzo1x_s1.asm
+++ b/asm/i386/src_nasm/lzo1x_s1.asm
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1y_f1.asm b/asm/i386/src_nasm/lzo1y_f1.asm
index 6ca700d..6c65bb1 100644
--- a/asm/i386/src_nasm/lzo1y_f1.asm
+++ b/asm/i386/src_nasm/lzo1y_f1.asm
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
diff --git a/asm/i386/src_nasm/lzo1y_s1.asm b/asm/i386/src_nasm/lzo1y_s1.asm
index b5c6ee7..08aeec3 100644
--- a/asm/i386/src_nasm/lzo1y_s1.asm
+++ b/asm/i386/src_nasm/lzo1y_s1.asm
@@ -2,7 +2,7 @@
;
; This file is part of the LZO real-time data compression library.
;
-; Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer
+; Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer
; All Rights Reserved.
;
; The LZO library is free software; you can redistribute it and/or
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 10:47:25 +0000