diff --git a/binutils-pr22868.diff b/binutils-pr22868.diff
deleted file mode 100644
index 8d68379..0000000
--- a/binutils-pr22868.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Fixes two testsuite fails in the gold plugin tests of LLVM.
-Aka binutils/PR22868
-Index: binutils-2.30/gold/resolve.cc
-===================================================================
---- binutils-2.30.orig/gold/resolve.cc	2018-01-13 14:31:16.000000000 +0100
-+++ binutils-2.30/gold/resolve.cc	2018-03-06 16:58:42.000000000 +0100
-@@ -265,10 +265,13 @@ Symbol_table::resolve(Sized_symbol<size>
-     return;
- 
-   // Likewise for an absolute symbol defined twice with the same value.
-+  // plugin-symbols are always absolute with same value here, so ignore those
-   if (!is_ordinary
-       && st_shndx == elfcpp::SHN_ABS
-       && !to_is_ordinary
-       && to_shndx == elfcpp::SHN_ABS
-+      && object->pluginobj() == NULL
-+      && to->object()->pluginobj() == NULL
-       && to->value() == sym.get_st_value())
-     return;
- 
diff --git a/binutils.changes b/binutils.changes
index 7c6eb64..89e9009 100644
--- a/binutils.changes
+++ b/binutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 13 08:35:38 UTC 2024 - Andreas Schwab <schwab@suse.de>
+
+- binutils-pr22868.diff: Remove obsolete patch
+- Undefine _FORTIFY_SOURCE when running checks
+
 -------------------------------------------------------------------
 Wed May  1 09:52:29 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
 
diff --git a/binutils.spec b/binutils.spec
index 4109f50..c749308 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -144,7 +144,6 @@ Patch14:        binutils-build-as-needed.diff
 Patch15:        binutils-znow.patch
 Patch22:        binutils-bfd_h.patch
 Patch34:        aarch64-common-pagesize.patch
-Patch36:        binutils-pr22868.diff
 Patch37:        binutils-revert-plt32-in-branches.diff
 Patch38:        binutils-fix-invalid-op-errata.diff
 Patch39:        binutils-revert-nm-symversion.diff
@@ -267,7 +266,6 @@ cp ld/ldgram.y ld/ldgram.y.orig
 %patch -P 15
 %patch -P 22
 %patch -P 34 -p1
-%patch -P 36 -p1
 %if %{suse_version} < 1550
 %patch -P 37 -p1
 %endif
@@ -503,7 +501,8 @@ cd build-dir
 %if 0%{?cross:1}
 make -k check CFLAGS="-O2 -g" CXXFLAGS="-O2 -g" CFLAGS_FOR_TARGET="-O2 -g" CXXFLAGS_FOR_TARGET="-O2 -g" || %{make_check_handling}
 %else
-make -k check CFLAGS="-g $RPM_OPT_FLAGS" CXXFLAGS="-g $RPM_OPT_FLAGS" CFLAGS_FOR_TARGET="-g $RPM_OPT_FLAGS" CXXFLAGS_FOR_TARGET="-g $RPM_OPT_FLAGS" || %{make_check_handling}
+# _FORTIFY_SOURCE does not work with -O0
+make -k check CFLAGS="-g $RPM_OPT_FLAGS -U_FORTIFY_SOURCE" CXXFLAGS="-g $RPM_OPT_FLAGS -U_FORTIFY_SOURCE" CFLAGS_FOR_TARGET="-g $RPM_OPT_FLAGS -U_FORTIFY_SOURCE" CXXFLAGS_FOR_TARGET="-g $RPM_OPT_FLAGS -U_FORTIFY_SOURCE" || %{make_check_handling}
 %endif
 
 %install