diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2020-11-06 17:52:09 +0100 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2020-11-06 17:52:09 +0100 |
| commit | 13cc3c5a08376f70aab3fc56ed303a452efc5bcb (patch) | |
| tree | 5d06cc8c2615c0968ff666c550586d9805aeb28f /core/nss/no-plt.diff | |
| parent | e5f2a2a84a1fae132bc9b514370528fa7d8572b4 (diff) | |
| download | packages-13cc3c5a08376f70aab3fc56ed303a452efc5bcb.tar.xz | |
core/nss: redone no-plt patch
Diffstat (limited to 'core/nss/no-plt.diff')
| -rw-r--r-- | core/nss/no-plt.diff | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/core/nss/no-plt.diff b/core/nss/no-plt.diff deleted file mode 100644 index 9014f8b7..00000000 --- a/core/nss/no-plt.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff --git i/security/nss/lib/freebl/mpi/mpi_x86.s w/security/nss/lib/freebl/mpi/mpi_x86.s -index 8f7e2130c3264754..b3ca1ce5b41b3771 100644 ---- i/security/nss/lib/freebl/mpi/mpi_x86.s -+++ w/security/nss/lib/freebl/mpi/mpi_x86.s -@@ -22,22 +22,41 @@ is_sse: .long -1 - # - .ifndef NO_PIC - .macro GET var,reg -- movl \var@GOTOFF(%ebx),\reg -+ call thunk.ax -+ addl $_GLOBAL_OFFSET_TABLE_, %eax -+ movl \var@GOTOFF(%eax),\reg - .endm - .macro PUT reg,var -- movl \reg,\var@GOTOFF(%ebx) -+ call thunk.dx -+ addl $_GLOBAL_OFFSET_TABLE_, %edx -+ movl \reg,\var@GOTOFF(%edx) - .endm - .else - .macro GET var,reg - movl \var,\reg - .endm - .macro PUT reg,var - movl \reg,\var - .endm - .endif - - .text - -+.ifndef NO_PIC -+.globl thunk.ax -+.hidden thunk.ax -+.type thunk.ax, @function -+thunk.ax: -+ movl (%esp),%eax -+ ret -+ -+.globl thunk.dx -+.hidden thunk.dx -+.type thunk.dx, @function -+thunk.dx: -+ movl (%esp),%edx -+ ret -+.endif - - # ebp - 36: caller's esi - # ebp - 32: caller's edi |