diff --git a/src/system/libroot/posix/glibc/arch/arm/Jamfile b/src/system/libroot/posix/glibc/arch/arm/Jamfile
index f3ec38d270..f8ec6fcb61 100644
--- a/src/system/libroot/posix/glibc/arch/arm/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/arm/Jamfile
@@ -29,6 +29,10 @@ local genericSources =
 	lshift.c rshift.c
 	sub_n.c submul_1.c
 
+	s_isnan.c s_isnanf.c
+	s_finite.c s_finitef.c
+	s_isinf.c s_isinff.c
+
 	s_clog.c s_clogf.c
 	s_csqrt.c s_csqrtf.c
 	s_cacos.c s_cacosf.c
diff --git a/src/system/libroot/posix/glibc/arch/arm64/Jamfile b/src/system/libroot/posix/glibc/arch/arm64/Jamfile
index 33bcdc36ca..b875fa948a 100644
--- a/src/system/libroot/posix/glibc/arch/arm64/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/arm64/Jamfile
@@ -29,6 +29,10 @@ local genericSources =
 	lshift.c rshift.c
 	sub_n.c submul_1.c
 
+	s_isnan.c s_isnanf.c
+	s_finite.c s_finitef.c
+	s_isinf.c s_isinff.c
+
 	s_clog.c s_clogf.c s_clogl.c
 	s_csqrt.c s_csqrtf.c s_csqrtl.c
 	s_cacos.c s_cacosf.c s_cacosl.c
diff --git a/src/system/libroot/posix/glibc/arch/m68k/Jamfile b/src/system/libroot/posix/glibc/arch/m68k/Jamfile
index e8fc19e019..4a11e73270 100644
--- a/src/system/libroot/posix/glibc/arch/m68k/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/m68k/Jamfile
@@ -25,7 +25,10 @@ local genericSources =
 	mul.c mul_n.c
 	ldbl2mpn.c
 
-	s_isnan.c s_isnanf.c s_isinf.c #s_isinff.c
+	s_isnan.c s_isnanf.c
+	s_finite.c #s_finitef.c
+	s_isinf.c #s_isinff.c
+
 	s_clog.c s_clogf.c #s_clogl.c
 	s_csqrt.c s_csqrtf.c #s_csqrtl.c
 	s_cacos.c s_cacosf.c #s_cacosl.c
diff --git a/src/system/libroot/posix/glibc/arch/ppc/Jamfile b/src/system/libroot/posix/glibc/arch/ppc/Jamfile
index 1d62f60592..70a77276cc 100644
--- a/src/system/libroot/posix/glibc/arch/ppc/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/ppc/Jamfile
@@ -24,6 +24,10 @@ local genericSources =
 	mpn2dbl.c mpn2flt.c mpn2ldbl.c
 	mul.c mul_n.c
 
+	s_isnan.c s_isnanf.c
+	s_finite.c s_finitef.c
+	s_isinf.c s_isinff.c
+
 	s_clog.c s_clogf.c
 	s_csqrt.c s_csqrtf.c
 	s_cacos.c s_cacosf.c
diff --git a/src/system/libroot/posix/glibc/arch/riscv64/Jamfile b/src/system/libroot/posix/glibc/arch/riscv64/Jamfile
index ba1134bd49..72df1ac1f8 100644
--- a/src/system/libroot/posix/glibc/arch/riscv64/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/riscv64/Jamfile
@@ -21,7 +21,6 @@ SubDirAsFlags -DPIC ;
 
 local genericSources =
 	lshift.c rshift.c submul_1.c
-	s_finite.c s_finitef.c
 	add_n.c sub_n.c
 	addmul_1.c mul_1.c
 
@@ -30,6 +29,10 @@ local genericSources =
 	mul.c mul_n.c
 	ldbl2mpn.c
 
+	s_isnan.c s_isnanf.c
+	s_finite.c s_finitef.c
+	s_isinf.c s_isinff.c
+
 	s_clog.c s_clogf.c s_clogl.c
 	s_csqrt.c s_csqrtf.c s_csqrtl.c
 	s_cacos.c s_cacosf.c s_cacosl.c
@@ -64,5 +67,3 @@ for architectureObject in [ MultiArchSubDirSetup riscv64 ] {
 				generic ] ;
 	}
 }
-
-
diff --git a/src/system/libroot/posix/glibc/arch/sparc/Jamfile b/src/system/libroot/posix/glibc/arch/sparc/Jamfile
index bb40966f74..24062bd755 100644
--- a/src/system/libroot/posix/glibc/arch/sparc/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/sparc/Jamfile
@@ -25,6 +25,10 @@ local genericSources =
 	mul.c mul_n.c
 	ldbl2mpn.c
 
+	s_isnan.c s_isnanf.c
+	s_finite.c s_finitef.c
+	s_isinf.c s_isinff.c
+
 	s_clog.c s_clogf.c s_clogl.c
 	s_csqrt.c s_csqrtf.c s_csqrtl.c
 	s_cacos.c s_cacosf.c s_cacosl.c
diff --git a/src/system/libroot/posix/glibc/arch/x86_64/Jamfile b/src/system/libroot/posix/glibc/arch/x86_64/Jamfile
index 1629281dba..7a07cffeae 100644
--- a/src/system/libroot/posix/glibc/arch/x86_64/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/x86_64/Jamfile
@@ -24,7 +24,10 @@ local genericSources =
 	mpn2dbl.c mpn2flt.c mpn2ldbl.c
 	mul.c mul_n.c
 
-	s_isnan.c s_isnanf.c s_finite.c s_finitef.c s_isinf.c s_isinff.c
+	s_isnan.c s_isnanf.c
+	s_finite.c s_finitef.c
+	s_isinf.c s_isinff.c
+
 	s_clog.c s_clogf.c s_clogl.c
 	s_csqrt.c s_csqrtf.c s_csqrtl.c
 	s_cacos.c s_cacosf.c s_cacosl.c