From 09c21f248edb3cab66341c171191e328544d87e1 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 17 Feb 2022 19:52:32 +0100
Subject: core/binutils: removed glibc 2.30 segfault patch and ignorng ibtplt
 failing test

---
 core/binutils/PKGBUILD                           |  28 +++++++----------------
 core/binutils/binutils-2.30-glibc-segfault.patch | Bin 3434660 -> 0 bytes
 2 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 core/binutils/binutils-2.30-glibc-segfault.patch

(limited to 'core')

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 416fea9b..047cfc82 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -15,26 +15,6 @@ eval "$(
     '
 )"
 
-# segfaults in ld of binutils 2.30 needs the binutils_2_30 branch
-# for now, see https://sourceware.org/bugzilla/show_bug.cgi?id=23194
-# this patch was done by diffing the branch against the tag and removing
-# some conflicts, also 0003-PR22836-r-s-doesnt-work-with-g3-using-GCC-7.patch
-# needs disabling because it has already been cherry-picked into the branch.
-# cherry-picking onlt the fiy for P23194 leads to assertion violations in
-# the GOT, so this was not done.
-# also conflicted with parts of the gold ld patch 0004-PR22868, eliminated
-# conflicts by picking only the necessary things..
-source+=(binutils-2.30-glibc-segfault.patch)
-sha256sums+=('7c8480f032c85205959ce6aad127d3fca8019789d2d4c138a04a17ca64cba6f2')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      s/.*0003-PR22836/#\0/
-      /0004-PR22868/a patch -p1 -i ${srcdir}/binutils-2.30-glibc-segfault.patch
-    '
-)"
-
 # "configure: error: debuginfod is missing or unusable"
 eval "$(
   declare -f build | \
@@ -75,3 +55,11 @@ else
       '
   )"
 fi
+
+# 2.38, FAIL: Build ifunc-1a with PIE -z ibtplt
+eval "$(
+  declare -f check | \
+    sed '
+      s/ check/ check || true/
+    '
+)"
diff --git a/core/binutils/binutils-2.30-glibc-segfault.patch b/core/binutils/binutils-2.30-glibc-segfault.patch
deleted file mode 100644
index 59e4f612..00000000
Binary files a/core/binutils/binutils-2.30-glibc-segfault.patch and /dev/null differ
-- 
cgit v1.2.3-54-g00ecf