22 files changed, 22 insertions, 18 deletions
diff --git a/sysdeps/powerpc/nofpu/Makefile b/sysdeps/powerpc/nofpu/Makefile
new file mode 100644
index 0000000000..f85cb0b7a3
--- /dev/null
+++ b/sysdeps/powerpc/nofpu/Makefile
@@ -0,0 +1,9 @@
+# Makefile fragment for PowerPC with no FPU.
+
+ifeq ($(subdir),soft-fp)
+sysdep_routines += $(gcc-single-routines) $(gcc-double-routines) sim-full
+endif
+
+ifeq ($(subdir),math)
+libm-support += fenv_const fe_nomask
+endif
diff --git a/sysdeps/powerpc/nofpu/Versions b/sysdeps/powerpc/nofpu/Versions
new file mode 100644
index 0000000000..4103db50bf
--- /dev/null
+++ b/sysdeps/powerpc/nofpu/Versions
@@ -0,0 +1,13 @@
+libc {
+  GLIBC_2.3.2 {
+    __sim_exceptions; __sim_disabled_exceptions; __sim_round_mode;
+    __adddf3; __addsf3; __divdf3; __divsf3; __eqdf2; __eqsf2;
+    __extendsfdf2; __fixdfdi; __fixdfsi; __fixsfdi; __fixsfsi;
+    __fixtfdi; __fixtfsi;
+    __fixunsdfdi; __fixunsdfsi; __fixunssfdi; __fixunssfsi;
+    __floatdidf; __floatdisf; __floatsidf; __floatsisf;
+    __gedf2; __gesf2; __ledf2; __lesf2; __muldf3; __mulsf3;
+    __negdf2; __negsf2; __sqrtdf2; __sqrtsf2; __subdf3;
+    __subsf3; __truncdfsf2; __trunctfsf2;
+  }
+}
diff --git a/sysdeps/powerpc/soft-fp/fclrexcpt.c b/sysdeps/powerpc/nofpu/fclrexcpt.c
index 16e96baeaf..16e96baeaf 100644
--- a/sysdeps/powerpc/soft-fp/fclrexcpt.c
+++ b/sysdeps/powerpc/nofpu/fclrexcpt.c
diff --git a/sysdeps/powerpc/soft-fp/fedisblxcpt.c b/sysdeps/powerpc/nofpu/fedisblxcpt.c
index 3d8dd4462f..3d8dd4462f 100644
--- a/sysdeps/powerpc/soft-fp/fedisblxcpt.c
+++ b/sysdeps/powerpc/nofpu/fedisblxcpt.c
diff --git a/sysdeps/powerpc/soft-fp/feenablxcpt.c b/sysdeps/powerpc/nofpu/feenablxcpt.c
index 060e450590..060e450590 100644
--- a/sysdeps/powerpc/soft-fp/feenablxcpt.c
+++ b/sysdeps/powerpc/nofpu/feenablxcpt.c
diff --git a/sysdeps/powerpc/soft-fp/fegetenv.c b/sysdeps/powerpc/nofpu/fegetenv.c
index 3cc8b13dac..3cc8b13dac 100644
--- a/sysdeps/powerpc/soft-fp/fegetenv.c
+++ b/sysdeps/powerpc/nofpu/fegetenv.c
diff --git a/sysdeps/powerpc/soft-fp/fegetexcept.c b/sysdeps/powerpc/nofpu/fegetexcept.c
index 0a47a09ac0..0a47a09ac0 100644
--- a/sysdeps/powerpc/soft-fp/fegetexcept.c
+++ b/sysdeps/powerpc/nofpu/fegetexcept.c
diff --git a/sysdeps/powerpc/soft-fp/fegetround.c b/sysdeps/powerpc/nofpu/fegetround.c
index 0d01e4411f..0d01e4411f 100644
--- a/sysdeps/powerpc/soft-fp/fegetround.c
+++ b/sysdeps/powerpc/nofpu/fegetround.c
diff --git a/sysdeps/powerpc/soft-fp/feholdexcpt.c b/sysdeps/powerpc/nofpu/feholdexcpt.c
index 786c691a4b..786c691a4b 100644
--- a/sysdeps/powerpc/soft-fp/feholdexcpt.c
+++ b/sysdeps/powerpc/nofpu/feholdexcpt.c
diff --git a/sysdeps/powerpc/soft-fp/fenv_const.c b/sysdeps/powerpc/nofpu/fenv_const.c
index 7dc2e817c8..7dc2e817c8 100644
--- a/sysdeps/powerpc/soft-fp/fenv_const.c
+++ b/sysdeps/powerpc/nofpu/fenv_const.c
diff --git a/sysdeps/powerpc/soft-fp/fesetenv.c b/sysdeps/powerpc/nofpu/fesetenv.c
index 43d03a45e2..43d03a45e2 100644
--- a/sysdeps/powerpc/soft-fp/fesetenv.c
+++ b/sysdeps/powerpc/nofpu/fesetenv.c
diff --git a/sysdeps/powerpc/soft-fp/fesetround.c b/sysdeps/powerpc/nofpu/fesetround.c
index 842614a974..842614a974 100644
--- a/sysdeps/powerpc/soft-fp/fesetround.c
+++ b/sysdeps/powerpc/nofpu/fesetround.c
diff --git a/sysdeps/powerpc/soft-fp/feupdateenv.c b/sysdeps/powerpc/nofpu/feupdateenv.c
index 5073776e7d..5073776e7d 100644
--- a/sysdeps/powerpc/soft-fp/feupdateenv.c
+++ b/sysdeps/powerpc/nofpu/feupdateenv.c
diff --git a/sysdeps/powerpc/soft-fp/fgetexcptflg.c b/sysdeps/powerpc/nofpu/fgetexcptflg.c
index 9d4f078d23..9d4f078d23 100644
--- a/sysdeps/powerpc/soft-fp/fgetexcptflg.c
+++ b/sysdeps/powerpc/nofpu/fgetexcptflg.c
diff --git a/sysdeps/powerpc/soft-fp/fraiseexcpt.c b/sysdeps/powerpc/nofpu/fraiseexcpt.c
index cd915027e1..cd915027e1 100644
--- a/sysdeps/powerpc/soft-fp/fraiseexcpt.c
+++ b/sysdeps/powerpc/nofpu/fraiseexcpt.c
diff --git a/sysdeps/powerpc/soft-fp/fsetexcptflg.c b/sysdeps/powerpc/nofpu/fsetexcptflg.c
index 85fd88f01f..85fd88f01f 100644
--- a/sysdeps/powerpc/soft-fp/fsetexcptflg.c
+++ b/sysdeps/powerpc/nofpu/fsetexcptflg.c
diff --git a/sysdeps/powerpc/soft-fp/ftestexcept.c b/sysdeps/powerpc/nofpu/ftestexcept.c
index ce8044fe0a..ce8044fe0a 100644
--- a/sysdeps/powerpc/soft-fp/ftestexcept.c
+++ b/sysdeps/powerpc/nofpu/ftestexcept.c
diff --git a/sysdeps/powerpc/soft-fp/libm-test-ulps b/sysdeps/powerpc/nofpu/libm-test-ulps
index e2091f8a15..e2091f8a15 100644
--- a/sysdeps/powerpc/soft-fp/libm-test-ulps
+++ b/sysdeps/powerpc/nofpu/libm-test-ulps
diff --git a/sysdeps/powerpc/soft-fp/sim-full.c b/sysdeps/powerpc/nofpu/sim-full.c
index 9f4c96ff20..9f4c96ff20 100644
--- a/sysdeps/powerpc/soft-fp/sim-full.c
+++ b/sysdeps/powerpc/nofpu/sim-full.c
diff --git a/sysdeps/powerpc/soft-fp/soft-supp.h b/sysdeps/powerpc/nofpu/soft-supp.h
index e358eda5c7..e358eda5c7 100644
--- a/sysdeps/powerpc/soft-fp/soft-supp.h
+++ b/sysdeps/powerpc/nofpu/soft-supp.h
diff --git a/sysdeps/powerpc/soft-fp/Makefile b/sysdeps/powerpc/soft-fp/Makefile
index cc60865a53..ff0a19119a 100644
--- a/sysdeps/powerpc/soft-fp/Makefile
+++ b/sysdeps/powerpc/soft-fp/Makefile
@@ -22,9 +22,6 @@
 # 02111-1307 USA.
 
 ifeq ($(subdir),soft-fp)
-ifeq ($(completely-soft),yes)
-sysdep_routines += $(gcc-single-routines) $(gcc-double-routines) sim-full
-endif
 ifeq ($(sizeof-long-double),16)
 powerpc-quad-routines := 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	\
@@ -35,8 +32,5 @@ endif
 endif
 
 ifeq ($(subdir),math)
-ifeq ($(completely-soft),yes)
-libm-support += fenv_const fe_nomask
-endif
 CPPFLAGS += -I../soft-fp/
 endif
diff --git a/sysdeps/powerpc/soft-fp/Versions b/sysdeps/powerpc/soft-fp/Versions
index 4bbb4e8646..935c9c8efd 100644
--- a/sysdeps/powerpc/soft-fp/Versions
+++ b/sysdeps/powerpc/soft-fp/Versions
@@ -6,16 +6,4 @@ libc {
     _q_utoq;
     _q_lltoq; _q_qtoll; _q_qtoull; _q_ulltoq;
   }
-
-  GLIBC_2.3.2 {
-    __sim_exceptions; __sim_disabled_exceptions; __sim_round_mode;
-    __adddf3; __addsf3; __divdf3; __divsf3; __eqdf2; __eqsf2;
-    __extendsfdf2; __fixdfdi; __fixdfsi; __fixsfdi; __fixsfsi;
-    __fixtfdi; __fixtfsi;
-    __fixunsdfdi; __fixunsdfsi; __fixunssfdi; __fixunssfsi;
-    __floatdidf; __floatdisf; __floatsidf; __floatsisf;
-    __gedf2; __gesf2; __ledf2; __lesf2; __muldf3; __mulsf3;
-    __negdf2; __negsf2; __sqrtdf2; __sqrtsf2; __subdf3;
-    __subsf3; __truncdfsf2; __trunctfsf2;
-  }
 }