diff -Nru glibc-2.39/debian/changelog glibc-2.39/debian/changelog --- glibc-2.39/debian/changelog 2024-03-01 05:02:21.000000000 +0000 +++ glibc-2.39/debian/changelog 2024-03-13 21:39:45.000000000 +0000 @@ -1,3 +1,10 @@ +glibc (2.39-0ubuntu6) noble; urgency=medium + + * Renable CET on x32 from i386 again as it may not work but disabling breaks + the build. + + -- Michael Hudson-Doyle Thu, 14 Mar 2024 10:39:45 +1300 + glibc (2.39-0ubuntu5) noble; urgency=medium * debian/testsuite-xfail-debian.mk: XFAIL a bunch of the conformance tests diff -Nru glibc-2.39/debian/sysdeps/i386.mk glibc-2.39/debian/sysdeps/i386.mk --- glibc-2.39/debian/sysdeps/i386.mk 2024-03-01 02:26:20.000000000 +0000 +++ glibc-2.39/debian/sysdeps/i386.mk 2024-03-13 21:39:15.000000000 +0000 @@ -44,7 +44,7 @@ DEB_ARCH_MULTILIB_PACKAGES += libc6-x32 libc6-dev-x32 libc6-x32_shlib_dep = libc6-x32 (>= $(shlib_dep_ver)) x32_configure_target = x86_64-linux-gnux32 -x32_extra_config_options = --enable-cet=no +x32_extra_config_options = --enable-cet=yes x32_CC = $(CC) -mx32 x32_CXX = $(CXX) -mx32 x32_mvec = yes