From a20a94bb8afd5391a92a0e3bdba441704ae5bf7b Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Thu, 12 Oct 2017 20:57:19 -0700 Subject: Revert "patch: disable bigrecy() on 32-bit platforms" This reverts commit 12f0a0a1b21c1461b15e4d06cb7473014a7ef14f. --- debian/changelog | 6 ------ debian/patches/bypass_bigrecy_32bit.patch | 26 -------------------------- debian/patches/series | 1 - 3 files changed, 33 deletions(-) delete mode 100644 debian/patches/bypass_bigrecy_32bit.patch diff --git a/debian/changelog b/debian/changelog index 18ac5a8..6361b65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -scm (5f2-2) UNRELEASED; urgency=medium - - * Temporary patch to fix 32-bit tests (and thus builds; Closes: #874112) - - -- Bryan Newbold Sat, 30 Sep 2017 21:37:13 -0700 - scm (5f2-1) unstable; urgency=medium * New upstream release (Closes: #791958) with improved floating point diff --git a/debian/patches/bypass_bigrecy_32bit.patch b/debian/patches/bypass_bigrecy_32bit.patch deleted file mode 100644 index 276bc8c..0000000 --- a/debian/patches/bypass_bigrecy_32bit.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Bypass bigrecy() optimization on 32-bit to fix test failure -Author: Bryan Newbold -Forwarded: yes ---- a/scl.c -+++ b/scl.c -@@ -132,12 +132,20 @@ void strrecy(str) - void bigrecy(bgnm) - SCM bgnm; - { -+/* As an emergency patch, only implement this GC optimization on specific -+ * 64-bit platforms. -+ * There is a "use-after-free" bug on 32-bit platforms, introduced as a -+ * regression between 5f1 and 5f2. --bnewbold (2017-09-30) -+ */ -+#if defined(__ia64__) || defined(__powerpc64__) || defined(__x86_64__) \ -+ || defined(__aarch64__) - if (IMP(bgnm) || !BIGP(bgnm)) return; - DEFER_INTS; - must_free(CHARS(bgnm), (sizet)NUMDIGS(bgnm)*sizeof(BIGDIG)); - CAR(bgnm) = INUM0; - CDR(bgnm) = INUM0; - ALLOW_INTS; -+#endif - } - - /* can convert to string accurately with bignums */ diff --git a/debian/patches/series b/debian/patches/series index c48ccd1..102a07f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,4 +4,3 @@ texinfo5_fixes.patch ppc64_short_int.patch arm64_short_int.patch hurd_maxpathlen.patch -bypass_bigrecy_32bit.patch -- cgit v1.2.3