[pkg-remote-commits] [xrdp] 03/03: un-picky NASM

[Thorsten Glaser]

This is an automated email from the git hooks/post-receive script.

tg pushed a commit to branch experimental
in repository xrdp.

commit bb6162f2064b6ac3694f14381fcec38e6e8d6f46
Author: mirabilos <t.glaser at tarent.de>
Date:   Thu Jan 26 19:59:49 2017 +0100

    un-picky NASM
---
 debian/changelog                       |  5 +--
 debian/patches/i386-pic-asm-part2.diff | 64 +++++++++++++++++-----------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4cec015..2341b0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xrdp (0.9.1-5~exp1) experimental; urgency=low
 
-  * Port i386 assembly files to ELF PIC; re-enable SIMD on any-i386.
+  * Upload to experimental.
+  * Port x86 assembly files to ELF PIC; re-enable SIMD on any-i386.
 
- -- Thorsten Glaser <tg at mirbsd.de>  Thu, 26 Jan 2017 19:53:21 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Thu, 26 Jan 2017 19:59:26 +0100
 
 xrdp (0.9.1-4) unstable; urgency=high
 
diff --git a/debian/patches/i386-pic-asm-part2.diff b/debian/patches/i386-pic-asm-part2.diff
index df1b0f9..cc7a656 100644
--- a/debian/patches/i386-pic-asm-part2.diff
+++ b/debian/patches/i386-pic-asm-part2.diff
@@ -17,13 +17,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif
@@ -478,13 +478,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif
@@ -919,13 +919,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif
@@ -978,13 +978,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif
@@ -1251,13 +1251,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif
@@ -1336,13 +1336,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif
@@ -1421,13 +1421,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif
@@ -1506,13 +1506,13 @@ Subject: Convert i386 asm code to ELF PIC
 +%ifdef PIC
 +section .text
 +extern _GLOBAL_OFFSET_TABLE_
-+.get_GOT:
-+	mov ebx,dword ptr [esp]
++.. at get_GOT:
++	mov ebx,[esp]
 +	ret
 +%define lsym(name) ebx + name wrt ..gotoff
 +%macro get_GOT 0
-+	call .get_GOT
-+	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.get_GOT wrt ..gotpc
++	call .. at get_GOT
++	add ebx,_GLOBAL_OFFSET_TABLE_+$$-.. at get_GOT wrt ..gotpc
 +%endmacro
 +%else
 +%endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git