diff --git a/app-i18n/uim/uim-1.8.9-r2.ebuild b/app-i18n/uim/uim-1.8.9-r2.ebuild
index 6414c90e1d4a1..8e2c2252a1f1e 100644
--- a/app-i18n/uim/uim-1.8.9-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.9-r2.ebuild
@@ -100,8 +100,9 @@ src_prepare() {
 	default
 	sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac
 	use nls || sed -i "/^if .*USE_NLS/,/^fi/d" configure.ac
-	# fix build with "-march=pentium4 -O2", bug #661806
-	use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions)
+
+	# bug #661806, bug #921399
+	append-cflags $(test-flags-CC -fno-inline-small-functions)
 
 	# Fix build w/ Clang 16+ and >= openssl 1.1.x, tries to use
 	# SSLv2_method otherwise.