diff --git a/libio/oldiofgetpos64.c b/libio/oldiofgetpos64.c
index 8591af33b5..072e7055dd 100644
--- a/libio/oldiofgetpos64.c
+++ b/libio/oldiofgetpos64.c
@@ -63,9 +63,9 @@ _IO_old_fgetpos64 (fp, posp)
 }
 
 #ifdef weak_alias
-compat_symbol (libc, _IO_old_fgetpos64, _IO_fgetpos64, GLIBC_2_0);
+compat_symbol (libc, _IO_old_fgetpos64, _IO_fgetpos64, GLIBC_2_1);
 strong_alias (_IO_old_fgetpos64, __old_fgetpos64)
-compat_symbol (libc, __old_fgetpos64, fgetpos64, GLIBC_2_0);
+compat_symbol (libc, __old_fgetpos64, fgetpos64, GLIBC_2_1);
 #endif
 
 #endif
diff --git a/libio/oldiofsetpos64.c b/libio/oldiofsetpos64.c
index 1ce42195f9..4f6d7593f4 100644
--- a/libio/oldiofsetpos64.c
+++ b/libio/oldiofsetpos64.c
@@ -61,9 +61,9 @@ _IO_old_fsetpos64 (fp, posp)
 }
 
 #ifdef weak_alias
-compat_symbol (libc, _IO_old_fsetpos64, _IO_fsetpos64, GLIBC_2_0);
+compat_symbol (libc, _IO_old_fsetpos64, _IO_fsetpos64, GLIBC_2_1);
 strong_alias (_IO_fsetpos64, __old_fsetpos64)
-compat_symbol (libc, __old_fsetpos64, _IO_fsetpos64, GLIBC_2_0);
+compat_symbol (libc, __old_fsetpos64, _IO_fsetpos64, GLIBC_2_1);
 #endif
 
 #endif
diff --git a/soft-fp/configure b/soft-fp/configure
deleted file mode 100755
index d40d2d7ba2..0000000000
--- a/soft-fp/configure
+++ /dev/null
@@ -1,2 +0,0 @@
-# This is only to keep the GNU C library configure mechanism happy.
-exit 0
diff --git a/soft-fp/sysdeps/powerpc/Versions b/soft-fp/sysdeps/powerpc/Versions
deleted file mode 100644
index 242aaf99cd..0000000000
--- a/soft-fp/sysdeps/powerpc/Versions
+++ /dev/null
@@ -1,8 +0,0 @@
-libc {
-  GLIBC_2.2 {
-    _q_add; _q_cmp; _q_cmpe; _q_div; _q_dtoq; _q_feq; _q_fge; _q_fgt;
-    _q_fle; _q_flt; _q_fne; _q_itoq; _q_mul; _q_neg; _q_qtod; _q_qtoi;
-    _q_qtos; _q_qtou; _q_sqrt; _q_stoq; _q_sub;
-    _q_utoq; 
-    _q_lltoq; _q_qtoll; _q_qtoull; _q_ulltoq; 
-}
diff --git a/soft-fp/sysdeps/powerpc/q_add.c b/sysdeps/powerpc/soft-fp/q_add.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_add.c
rename to sysdeps/powerpc/soft-fp/q_add.c
diff --git a/soft-fp/sysdeps/powerpc/q_cmp.c b/sysdeps/powerpc/soft-fp/q_cmp.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_cmp.c
rename to sysdeps/powerpc/soft-fp/q_cmp.c
diff --git a/soft-fp/sysdeps/powerpc/q_cmpe.c b/sysdeps/powerpc/soft-fp/q_cmpe.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_cmpe.c
rename to sysdeps/powerpc/soft-fp/q_cmpe.c
diff --git a/soft-fp/sysdeps/powerpc/q_div.c b/sysdeps/powerpc/soft-fp/q_div.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_div.c
rename to sysdeps/powerpc/soft-fp/q_div.c
diff --git a/soft-fp/sysdeps/powerpc/q_dtoq.c b/sysdeps/powerpc/soft-fp/q_dtoq.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_dtoq.c
rename to sysdeps/powerpc/soft-fp/q_dtoq.c
diff --git a/soft-fp/sysdeps/powerpc/q_feq.c b/sysdeps/powerpc/soft-fp/q_feq.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_feq.c
rename to sysdeps/powerpc/soft-fp/q_feq.c
diff --git a/soft-fp/sysdeps/powerpc/q_fge.c b/sysdeps/powerpc/soft-fp/q_fge.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_fge.c
rename to sysdeps/powerpc/soft-fp/q_fge.c
diff --git a/soft-fp/sysdeps/powerpc/q_fgt.c b/sysdeps/powerpc/soft-fp/q_fgt.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_fgt.c
rename to sysdeps/powerpc/soft-fp/q_fgt.c
diff --git a/soft-fp/sysdeps/powerpc/q_fle.c b/sysdeps/powerpc/soft-fp/q_fle.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_fle.c
rename to sysdeps/powerpc/soft-fp/q_fle.c
diff --git a/soft-fp/sysdeps/powerpc/q_flt.c b/sysdeps/powerpc/soft-fp/q_flt.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_flt.c
rename to sysdeps/powerpc/soft-fp/q_flt.c
diff --git a/soft-fp/sysdeps/powerpc/q_fne.c b/sysdeps/powerpc/soft-fp/q_fne.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_fne.c
rename to sysdeps/powerpc/soft-fp/q_fne.c
diff --git a/soft-fp/sysdeps/powerpc/q_itoq.c b/sysdeps/powerpc/soft-fp/q_itoq.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_itoq.c
rename to sysdeps/powerpc/soft-fp/q_itoq.c
diff --git a/soft-fp/sysdeps/powerpc/q_lltoq.c b/sysdeps/powerpc/soft-fp/q_lltoq.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_lltoq.c
rename to sysdeps/powerpc/soft-fp/q_lltoq.c
diff --git a/soft-fp/sysdeps/powerpc/q_mul.c b/sysdeps/powerpc/soft-fp/q_mul.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_mul.c
rename to sysdeps/powerpc/soft-fp/q_mul.c
diff --git a/soft-fp/sysdeps/powerpc/q_neg.c b/sysdeps/powerpc/soft-fp/q_neg.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_neg.c
rename to sysdeps/powerpc/soft-fp/q_neg.c
diff --git a/soft-fp/sysdeps/powerpc/q_qtod.c b/sysdeps/powerpc/soft-fp/q_qtod.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_qtod.c
rename to sysdeps/powerpc/soft-fp/q_qtod.c
diff --git a/soft-fp/sysdeps/powerpc/q_qtoi.c b/sysdeps/powerpc/soft-fp/q_qtoi.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_qtoi.c
rename to sysdeps/powerpc/soft-fp/q_qtoi.c
diff --git a/soft-fp/sysdeps/powerpc/q_qtoll.c b/sysdeps/powerpc/soft-fp/q_qtoll.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_qtoll.c
rename to sysdeps/powerpc/soft-fp/q_qtoll.c
diff --git a/soft-fp/sysdeps/powerpc/q_qtos.c b/sysdeps/powerpc/soft-fp/q_qtos.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_qtos.c
rename to sysdeps/powerpc/soft-fp/q_qtos.c
diff --git a/soft-fp/sysdeps/powerpc/q_qtou.c b/sysdeps/powerpc/soft-fp/q_qtou.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_qtou.c
rename to sysdeps/powerpc/soft-fp/q_qtou.c
diff --git a/soft-fp/sysdeps/powerpc/q_qtoull.c b/sysdeps/powerpc/soft-fp/q_qtoull.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_qtoull.c
rename to sysdeps/powerpc/soft-fp/q_qtoull.c
diff --git a/soft-fp/sysdeps/powerpc/q_sqrt.c b/sysdeps/powerpc/soft-fp/q_sqrt.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_sqrt.c
rename to sysdeps/powerpc/soft-fp/q_sqrt.c
diff --git a/soft-fp/sysdeps/powerpc/q_stoq.c b/sysdeps/powerpc/soft-fp/q_stoq.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_stoq.c
rename to sysdeps/powerpc/soft-fp/q_stoq.c
diff --git a/soft-fp/sysdeps/powerpc/q_sub.c b/sysdeps/powerpc/soft-fp/q_sub.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_sub.c
rename to sysdeps/powerpc/soft-fp/q_sub.c
diff --git a/soft-fp/sysdeps/powerpc/q_ulltoq.c b/sysdeps/powerpc/soft-fp/q_ulltoq.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_ulltoq.c
rename to sysdeps/powerpc/soft-fp/q_ulltoq.c
diff --git a/soft-fp/sysdeps/powerpc/q_util.c b/sysdeps/powerpc/soft-fp/q_util.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_util.c
rename to sysdeps/powerpc/soft-fp/q_util.c
diff --git a/soft-fp/sysdeps/powerpc/q_utoq.c b/sysdeps/powerpc/soft-fp/q_utoq.c
similarity index 100%
rename from soft-fp/sysdeps/powerpc/q_utoq.c
rename to sysdeps/powerpc/soft-fp/q_utoq.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_add.c b/sysdeps/sparc/sparc32/soft-fp/q_add.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_add.c
rename to sysdeps/sparc/sparc32/soft-fp/q_add.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_cmp.c b/sysdeps/sparc/sparc32/soft-fp/q_cmp.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_cmp.c
rename to sysdeps/sparc/sparc32/soft-fp/q_cmp.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_cmpe.c b/sysdeps/sparc/sparc32/soft-fp/q_cmpe.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_cmpe.c
rename to sysdeps/sparc/sparc32/soft-fp/q_cmpe.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_div.c b/sysdeps/sparc/sparc32/soft-fp/q_div.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_div.c
rename to sysdeps/sparc/sparc32/soft-fp/q_div.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_dtoq.c b/sysdeps/sparc/sparc32/soft-fp/q_dtoq.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_dtoq.c
rename to sysdeps/sparc/sparc32/soft-fp/q_dtoq.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_feq.c b/sysdeps/sparc/sparc32/soft-fp/q_feq.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_feq.c
rename to sysdeps/sparc/sparc32/soft-fp/q_feq.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_fge.c b/sysdeps/sparc/sparc32/soft-fp/q_fge.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_fge.c
rename to sysdeps/sparc/sparc32/soft-fp/q_fge.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_fgt.c b/sysdeps/sparc/sparc32/soft-fp/q_fgt.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_fgt.c
rename to sysdeps/sparc/sparc32/soft-fp/q_fgt.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_fle.c b/sysdeps/sparc/sparc32/soft-fp/q_fle.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_fle.c
rename to sysdeps/sparc/sparc32/soft-fp/q_fle.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_flt.c b/sysdeps/sparc/sparc32/soft-fp/q_flt.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_flt.c
rename to sysdeps/sparc/sparc32/soft-fp/q_flt.c
diff --git a/soft-fp/sysdeps/sparc/sparc32/q_itoq.c b/sysdeps/sparc/sparc32/soft-fp/q_itoq.c
similarity index 100%
rename from soft-fp/sysdeps/sparc/sparc32/q_itoq.c
rename to sysdeps/sparc/sparc32/soft-fp/q_itoq.c