diff --git a/src/system/libroot/posix/glibc/arch/cmp.c b/src/system/libroot/posix/glibc/arch/generic/cmp.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/cmp.c
rename to src/system/libroot/posix/glibc/arch/generic/cmp.c
diff --git a/src/system/libroot/posix/glibc/arch/dbl2mpn.c b/src/system/libroot/posix/glibc/arch/generic/dbl2mpn.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/dbl2mpn.c
rename to src/system/libroot/posix/glibc/arch/generic/dbl2mpn.c
diff --git a/src/system/libroot/posix/glibc/arch/divrem.c b/src/system/libroot/posix/glibc/arch/generic/divrem.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/divrem.c
rename to src/system/libroot/posix/glibc/arch/generic/divrem.c
diff --git a/src/system/libroot/posix/glibc/arch/mpn2dbl.c b/src/system/libroot/posix/glibc/arch/generic/mpn2dbl.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/mpn2dbl.c
rename to src/system/libroot/posix/glibc/arch/generic/mpn2dbl.c
diff --git a/src/system/libroot/posix/glibc/arch/mul.c b/src/system/libroot/posix/glibc/arch/generic/mul.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/mul.c
rename to src/system/libroot/posix/glibc/arch/generic/mul.c
diff --git a/src/system/libroot/posix/glibc/arch/mul_n.c b/src/system/libroot/posix/glibc/arch/generic/mul_n.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/mul_n.c
rename to src/system/libroot/posix/glibc/arch/generic/mul_n.c
diff --git a/src/system/libroot/posix/glibc/arch/s_fpclassify.c b/src/system/libroot/posix/glibc/arch/generic/s_fpclassify.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/s_fpclassify.c
rename to src/system/libroot/posix/glibc/arch/generic/s_fpclassify.c
diff --git a/src/system/libroot/posix/glibc/arch/s_fpclassifyf.c b/src/system/libroot/posix/glibc/arch/generic/s_fpclassifyf.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/s_fpclassifyf.c
rename to src/system/libroot/posix/glibc/arch/generic/s_fpclassifyf.c
diff --git a/src/system/libroot/posix/glibc/arch/s_fpclassifyl.c b/src/system/libroot/posix/glibc/arch/generic/s_fpclassifyl.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/s_fpclassifyl.c
rename to src/system/libroot/posix/glibc/arch/generic/s_fpclassifyl.c
diff --git a/src/system/libroot/posix/glibc/arch/s_modf.c b/src/system/libroot/posix/glibc/arch/generic/s_modf.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/s_modf.c
rename to src/system/libroot/posix/glibc/arch/generic/s_modf.c
diff --git a/src/system/libroot/posix/glibc/arch/s_modff.c b/src/system/libroot/posix/glibc/arch/generic/s_modff.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/s_modff.c
rename to src/system/libroot/posix/glibc/arch/generic/s_modff.c
diff --git a/src/system/libroot/posix/glibc/arch/s_modfl.c b/src/system/libroot/posix/glibc/arch/generic/s_modfl.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/s_modfl.c
rename to src/system/libroot/posix/glibc/arch/generic/s_modfl.c
diff --git a/src/system/libroot/posix/glibc/arch/w_atan2.c b/src/system/libroot/posix/glibc/arch/generic/w_atan2.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/w_atan2.c
rename to src/system/libroot/posix/glibc/arch/generic/w_atan2.c
diff --git a/src/system/libroot/posix/glibc/arch/w_atan2f.c b/src/system/libroot/posix/glibc/arch/generic/w_atan2f.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/w_atan2f.c
rename to src/system/libroot/posix/glibc/arch/generic/w_atan2f.c
diff --git a/src/system/libroot/posix/glibc/arch/w_atan2l.c b/src/system/libroot/posix/glibc/arch/generic/w_atan2l.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/w_atan2l.c
rename to src/system/libroot/posix/glibc/arch/generic/w_atan2l.c
diff --git a/src/system/libroot/posix/glibc/arch/w_fmod.c b/src/system/libroot/posix/glibc/arch/generic/w_fmod.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/w_fmod.c
rename to src/system/libroot/posix/glibc/arch/generic/w_fmod.c
diff --git a/src/system/libroot/posix/glibc/arch/w_fmodf.c b/src/system/libroot/posix/glibc/arch/generic/w_fmodf.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/w_fmodf.c
rename to src/system/libroot/posix/glibc/arch/generic/w_fmodf.c
diff --git a/src/system/libroot/posix/glibc/arch/w_fmodl.c b/src/system/libroot/posix/glibc/arch/generic/w_fmodl.c
similarity index 100%
rename from src/system/libroot/posix/glibc/arch/w_fmodl.c
rename to src/system/libroot/posix/glibc/arch/generic/w_fmodl.c
diff --git a/src/system/libroot/posix/glibc/arch/ppc/Jamfile b/src/system/libroot/posix/glibc/arch/ppc/Jamfile
index adefd53136..d48890cb5f 100644
--- a/src/system/libroot/posix/glibc/arch/ppc/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/ppc/Jamfile
@@ -70,4 +70,4 @@ MergeObject posix_gnu_arch_$(TARGET_ARCH).o :
 ;
 
 SEARCH on [ FGristFiles $(genericSources) ]
-	= [ FDirName $(HAIKU_TOP) src system libroot posix glibc arch ] ;
+	= [ FDirName $(HAIKU_TOP) src system libroot posix glibc arch generic ] ;
diff --git a/src/system/libroot/posix/glibc/arch/x86/Jamfile b/src/system/libroot/posix/glibc/arch/x86/Jamfile
index fcf55408c3..6074b79be8 100644
--- a/src/system/libroot/posix/glibc/arch/x86/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/x86/Jamfile
@@ -70,4 +70,4 @@ MergeObject posix_gnu_arch_$(TARGET_ARCH).o :
 ;
 
 SEARCH on [ FGristFiles $(genericSources) ]
-	= [ FDirName $(HAIKU_TOP) src system libroot posix glibc arch ] ;
+	= [ FDirName $(HAIKU_TOP) src system libroot posix glibc arch generic ] ;