diff -Nru syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/changelog syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/changelog
--- syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/changelog	2021-08-11 06:29:22.000000000 +0200
+++ syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/changelog	2023-09-21 17:07:01.000000000 +0200
@@ -1,5 +1,14 @@
+syslinux (3:6.04~git20190206.bf6db5b4+dfsg1-3ubuntuppa8ubuntu2) mantic; urgency=medium
+
+  [ Paul Mars ]
+  * Fix build ignoring the new default -fcf-protection flag added
+    by dpkg-buildflags. LP: #2036757
+
+ -- Paul Mars <paul.mars@canonical.com>  Thu, 21 Sep 2023 17:07:01 +0200
+
 syslinux (3:6.04~git20190206.bf6db5b4+dfsg1-3ubuntu1) impish; urgency=medium
 
+  [ Michael Hudson-Doyle ]
   * Fix build with glibc 2.34, apparently some header previously
     implicitly #included setjmp.h and now doesnt.
 
diff -Nru syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/0021-dpkg-buildflags-compatibility.patch syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/0021-dpkg-buildflags-compatibility.patch
--- syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/0021-dpkg-buildflags-compatibility.patch	1970-01-01 01:00:00.000000000 +0100
+++ syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/0021-dpkg-buildflags-compatibility.patch	2023-09-21 11:18:57.000000000 +0200
@@ -0,0 +1,17 @@
+Description:  remove -fcf-protection flag added by dpkg-buildflags
+ The -fcf-protection flag is not compatible with -m32 but since we are building on amd64 
+it is added by default by dpkg-buildflags. So we remove it explicitly.
+Author: Paul Mars <paul.mars@canonical.com>
+Bug: LP: #2036757
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/mk/embedded.mk
++++ b/mk/embedded.mk
+@@ -24,6 +24,7 @@
+ ifeq ($(ARCH),i386)
+ 	GCCOPT := $(call gcc_ok,-m32)
+ 	GCCOPT += $(call gcc_ok,-march=i386)
++	GCCOPT    += $(call gcc_ok,-fcf-protection=none,)
+ 	GCCOPT    += $(call gcc_ok,-mpreferred-stack-boundary=2,)
+ 	GCCOPT    += $(call gcc_ok,-mincoming-stack-boundary=2,)
+ endif
diff -Nru syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/series syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/series
--- syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/series	2021-08-11 05:55:46.000000000 +0200
+++ syslinux-6.04~git20190206.bf6db5b4+dfsg1/debian/patches/series	2023-09-21 10:50:26.000000000 +0200
@@ -7,3 +7,4 @@
 0018-prevent-pow-optimization.patch
 0019-gcc-10-compatibility.patch
 0020-include-setjmp.h-in-efi-main.c.patch
+0021-dpkg-buildflags-compatibility.patch