diff -Nru openblas-0.3.18+ds/debian/changelog openblas-0.3.18+ds/debian/changelog
--- openblas-0.3.18+ds/debian/changelog	2021-10-30 00:01:09.000000000 +0000
+++ openblas-0.3.18+ds/debian/changelog	2021-11-03 00:27:51.000000000 +0000
@@ -1,3 +1,11 @@
+openblas (0.3.18+ds-2+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 0.2.15-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 11 Mar 2016 23:39:32 +0000]
+  * Disable arm-gcc-flags.patch which was enforcing gcc flags that are wrong
+    for raspbian.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 03 Nov 2021 00:27:51 +0000
+
 openblas (0.3.18+ds-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru openblas-0.3.18+ds/debian/patches/auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053 openblas-0.3.18+ds/debian/patches/auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053
--- openblas-0.3.18+ds/debian/patches/auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053	1970-01-01 00:00:00.000000000 +0000
+++ openblas-0.3.18+ds/debian/patches/auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053	2021-11-03 00:27:51.000000000 +0000
@@ -0,0 +1,44 @@
+From: Raspbian forward porter <root@raspbian.org>
+Subject: Automatically generated patch (0.3.7+ds-1+rpi1)
+
+Last (up to) 3 git changes, FYI:
+
+commit e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5
+Merge: c514376 51be127
+Author: Raspbian automatic forward porter <root@raspbian.org>
+Date:   Sat Aug 24 06:04:09 2019 +0100
+
+    Merge version 0.3.6+ds-1+rpi1 and 0.3.7+ds-1 to produce 0.3.7+ds-1+rpi1
+
+commit 51be127fefff977e35950b127f4f642b9661d64b
+Merge: 792daf6 51c9282
+Author: Sébastien Villemot <sebastien@debian.org>
+Date:   Tue Aug 20 16:52:34 2019 +0100
+
+    Merge openblas (0.3.7+ds-1) import into refs/heads/workingbranch
+
+commit 792daf6d1ad1dca6d81a262dcf1d72dc96e0464d
+Author: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
+Date:   Tue Aug 20 16:52:34 2019 +0100
+
+    dgemm-test-without-lapacke
+    
+    
+    Gbp-Pq: Name dgemm-test-without-lapacke.patch
+---
+
+Index: tempdefuzz/Makefile.arm
+===================================================================
+--- tempdefuzz.orig/Makefile.arm
++++ tempdefuzz/Makefile.arm
+@@ -9,8 +9,8 @@ endif
+ endif
+ 
+ ifeq ($(CORE), ARMV6)
+-CCOMMON_OPT += -mfpu=vfp
+-FCOMMON_OPT += -mfpu=vfp
++CCOMMON_OPT += -mfpu=vfp -march=armv6
++FCOMMON_OPT += -mfpu=vfp -march=armv6
+ endif
+ 
+ ifdef HAVE_NEON
diff -Nru openblas-0.3.18+ds/debian/patches/series openblas-0.3.18+ds/debian/patches/series
--- openblas-0.3.18+ds/debian/patches/series	2021-10-28 20:11:18.000000000 +0000
+++ openblas-0.3.18+ds/debian/patches/series	2021-11-03 00:27:51.000000000 +0000
@@ -1,4 +1,3 @@
-arm-gcc-flags.patch
 kfreebsd.patch
 remove-openmp-warning.patch
 no-embedded-lapack.patch
@@ -6,3 +5,4 @@
 matgen-symbols-not-included.patch
 gensymbols-fix-detect-netlib.patch
 3422.patch
+auto-0.3.7+ds-1+rpi1-e5cdb5bc2fdbe4ed5849a311d639ae1e43ddffb5-1566623053