Date: Saturday, December 12, 2020 @ 12:55:47 Author: heftig Revision: 773273
3.60-1 Added: lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch (from rev 773272, lib32-nss/trunk/no-plt.diff) Modified: lib32-nss/trunk/PKGBUILD Deleted: lib32-nss/trunk/no-plt.diff ------------------------------------------------+ 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch | 57 +++++++++++++++++++++++ PKGBUILD | 10 ++-- no-plt.diff | 48 ------------------- 3 files changed, 62 insertions(+), 53 deletions(-) Copied: lib32-nss/trunk/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch (from rev 773272, lib32-nss/trunk/no-plt.diff) =================================================================== --- 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch (rev 0) +++ 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch 2020-12-12 12:55:47 UTC (rev 773273) @@ -0,0 +1,57 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sat, 12 Dec 2020 13:43:54 +0100 +Subject: [PATCH] Hack mpi_x64.s to work with -fno-plt + +--- + lib/freebl/mpi/mpi_x86.s | 23 +++++++++++++++++++++-- + 1 file changed, 21 insertions(+), 2 deletions(-) + +diff --git a/lib/freebl/mpi/mpi_x86.s b/lib/freebl/mpi/mpi_x86.s +index 8f7e2130c3..b3ca1ce5b4 100644 +--- a/lib/freebl/mpi/mpi_x86.s ++++ b/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 Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-12 12:03:55 UTC (rev 773272) +++ PKGBUILD 2020-12-12 12:55:47 UTC (rev 773273) @@ -4,7 +4,7 @@ # Contributor: Ionut Biru <ibiru at archlinux dot org> pkgname=lib32-nss -pkgver=3.59 +pkgver=3.60 pkgrel=1 pkgdesc="Network Security Services (32-bit)" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" @@ -13,15 +13,15 @@ depends=(lib32-nspr lib32-sqlite lib32-zlib 'lib32-p11-kit>=0.23.19') makedepends=(perl python gyp) source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz" - no-plt.diff) -sha256sums=('e6298174caa8527beacdc2858f77ed098d7047c1792846040e27e420fed0ce24' - 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa') + 0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch) +sha256sums=('84abd5575ab874c53ae511bd461e5d0868d1a1b384ee40753154cdd1d590fe3d' + 'e27a9fc2e7687ab9c1cb430917f13775ab29f9abf4c2032ea262a5a2a8b43ffa') prepare() { cd nss-$pkgver/nss # https://bugzilla.mozilla.org/show_bug.cgi?id=1382942 - patch -Np3 -i "$srcdir/no-plt.diff" + patch -Np1 -i "$srcdir/0001-Hack-mpi_x64.s-to-work-with-fno-plt.patch" } build() { Deleted: no-plt.diff =================================================================== --- no-plt.diff 2020-12-12 12:03:55 UTC (rev 773272) +++ no-plt.diff 2020-12-12 12:55:47 UTC (rev 773273) @@ -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