summaryrefslogtreecommitdiff
path: root/core/nss/nss-3.58-no-plt.patch
blob: cd9183af86629e9b9c4e20e0e8f34cb3e993e814 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
diff -rauN nss-3.58/nss/lib/freebl/mpi/mpi_x86.s nss-3.58-no-plt-patch/nss/lib/freebl/mpi/mpi_x86.s
--- nss-3.58/nss/lib/freebl/mpi/mpi_x86.s	2020-10-16 16:50:49.000000000 +0200
+++ nss-3.58-no-plt-patch/nss/lib/freebl/mpi/mpi_x86.s	2020-11-06 17:46:18.822061734 +0100
@@ -22,10 +22,14 @@
 #
 .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
@@ -38,6 +42,21 @@
 
 .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