Update.

2000-09-06  Andreas Jaeger  <aj@suse.de>

	* sysdeps/powerpc/Makefile [$(subdir) = elf]: Modify
	sysdep-dl-routines and sysdep_routines instead of rtld-routines
	and dl-routines.

	* soft-fp/ChangeLog: Merged with this file.

2000-06-13  Ulrich Drepper  <drepper@redhat.com>

        * soft-fp/Makefile (distribute): Add op-8.h and testit.c.

        * soft-fp/Makefile (distribute): Add the math functions, too.

        * soft-fp/Makefile (distribute): Add ChangeLog, Banner, and configure.

2000-03-03  Geoff Keating  <geoffk@cygnus.com>

        * soft-fp/soft-fp.h (_FP_ROUND_ZERO): Cast 0 to void before using it
        as a statement.

        * soft-fp/sysdeps/powerpc/Makefile (routines): New file.
        * soft-fp/sysdeps/powerpc/q_*: New files.

3 files changed, 26 insertions, 153 deletions

diff --git a/ChangeLog b/ChangeLog
index e49fa847b1..dffff547c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2000-09-06  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/powerpc/Makefile [$(subdir) = elf]: Modify
+	sysdep-dl-routines and sysdep_routines instead of rtld-routines
+	and dl-routines.
+
+	* soft-fp/ChangeLog: Merged with this file.
+
+2000-06-13  Ulrich Drepper  <drepper@redhat.com>
+
+        * soft-fp/Makefile (distribute): Add op-8.h and testit.c.
+
+        * soft-fp/Makefile (distribute): Add the math functions, too.
+
+        * soft-fp/Makefile (distribute): Add ChangeLog, Banner, and configure.
+
+2000-03-03  Geoff Keating  <geoffk@cygnus.com>
+
+        * soft-fp/soft-fp.h (_FP_ROUND_ZERO): Cast 0 to void before using it
+        as a statement.
+
+        * soft-fp/sysdeps/powerpc/Makefile (routines): New file.
+        * soft-fp/sysdeps/powerpc/q_*: New files.
+
 2000-09-05  Ulrich Drepper  <drepper@redhat.com>
 
 	* stdio-common/vfprintf.c (process_string_arg): Handle precision
diff --git a/soft-fp/ChangeLog b/soft-fp/ChangeLog
deleted file mode 100644
index 1e3c6e9131..0000000000
--- a/soft-fp/ChangeLog
+++ /dev/null
@@ -1,151 +0,0 @@
-2000-06-13  Ulrich Drepper  <drepper@redhat.com>
-
-	* Makefile (distribute): Add op-8.h and testit.c.
-
-	* Makefile (distribute): Add the math functions, too.
-
-	* Makefile (distribute): Add ChangeLog, Banner, and configure.
-
-2000-03-03  Geoff Keating  <geoffk@cygnus.com>
-
-	* soft-fp.h (_FP_ROUND_ZERO): Cast 0 to void before using it
-	as a statement.
-
-	* sysdeps/powerpc/Makefile (routines): New file.
-	* sysdeps/powerpc/q_*: New files.
-
-1999-10-29  Jakub Jelinek  <jakub@redhat.com>
-
-	* Makefile: New file.
-	* adddf3.c: New file.
-	* addsf3.c: New file.
-	* addtf3.c: New file.
-	* divdf3.c: New file.
-	* divsf3.c: New file.
-	* divtf3.c: New file.
-	* double.h: New file.
-	* eqdf2.c: New file.
-	* eqsf2.c: New file.
-	* eqtf2.c: New file.
-	* extenddftf2.c: New file.
-	* extendsfdf2.c: New file.
-	* extendsftf2.c: New file.
-	* fixdfdi.c: New file.
-	* fixdfsi.c: New file.
-	* fixsfdi.c: New file.
-	* fixsfsi.c: New file.
-	* fixtfdi.c: New file.
-	* fixtfsi.c: New file.
-	* fixunsdfdi.c: New file.
-	* fixunsdfsi.c: New file.
-	* fixunssfdi.c: New file.
-	* fixunssfsi.c: New file.
-	* fixunstfdi.c: New file.
-	* fixunstfsi.c: New file.
-	* floatdidf.c: New file.
-	* floatdisf.c: New file.
-	* floatditf.c: New file.
-	* floatsidf.c: New file.
-	* floatsisf.c: New file.
-	* floatsitf.c: New file.
-	* gedf2.c: New file.
-	* gesf2.c: New file.
-	* getf2.c: New file.
-	* ledf2.c: New file.
-	* lesf2.c: New file.
-	* letf2.c: New file.
-	* muldf3.c: New file.
-	* mulsf3.c: New file.
-	* multf3.c: New file.
-	* negdf2.c: New file.
-	* negsf2.c: New file.
-	* negtf2.c: New file.
-	* op-1.h: New file.
-	* op-2.h: New file.
-	* op-4.h: New file.
-	* op-common.h: New file.
-	* quad.h: New file.
-	* single.h: New file.
-	* soft-fp.h: New file.
-	* subdf3.c: New file.
-	* subsf3.c: New file.
-	* subtf3.c: New file.
-	* testit.c: New file.
-	* truncdfsf2.c: New file.
-	* trunctfdf2.c: New file.
-	* trunctfsf2.c: New file.
-	* Banner: New file.
-	* configure: New file.
-	* op-8.h: New file.
-	* sqrtdf2.c: New file.
-	* extended.h: New file.
-	* sqrtsf2.c: New file.
-	* sqrttf2.c: New file.
-	* sysdeps/i386/sfp-machine.h: New file.
-	* sysdeps/alpha/sfp-machine.h: New file.
-	* sysdeps/sparc/sparc64/sfp-machine.h: New file.
-	* sysdeps/sparc/sparc64/Makefile: New file.
-	* sysdeps/sparc/sparc64/qp_qtoux.c: New file.
-	* sysdeps/sparc/sparc64/qp_add.c: New file.
-	* sysdeps/sparc/sparc64/qp_div.c: New file.
-	* sysdeps/sparc/sparc64/qp_dtoq.c: New file.
-	* sysdeps/sparc/sparc64/qp_feq.c: New file.
-	* sysdeps/sparc/sparc64/qp_fge.c: New file.
-	* sysdeps/sparc/sparc64/qp_fle.c: New file.
-	* sysdeps/sparc/sparc64/qp_itoq.c: New file.
-	* sysdeps/sparc/sparc64/qp_mul.c: New file.
-	* sysdeps/sparc/sparc64/qp_qtod.c: New file.
-	* sysdeps/sparc/sparc64/qp_qtoi.c: New file.
-	* sysdeps/sparc/sparc64/qp_qtos.c: New file.
-	* sysdeps/sparc/sparc64/Versions: New file.
-	* sysdeps/sparc/sparc64/qp_stoq.c: New file.
-	* sysdeps/sparc/sparc64/qp_sub.c: New file.
-	* sysdeps/sparc/sparc64/qp_fne.c: New file.
-	* sysdeps/sparc/sparc64/qp_cmp.c: New file.
-	* sysdeps/sparc/sparc64/qp_uxtoq.c: New file.
-	* sysdeps/sparc/sparc64/qp_fgt.c: New file.
-	* sysdeps/sparc/sparc64/qp_cmpe.c: New file.
-	* sysdeps/sparc/sparc64/s_frexpl.c: New file.
-	* sysdeps/sparc/sparc64/qp_qtox.c: New file.
-	* sysdeps/sparc/sparc64/qp_flt.c: New file.
-	* sysdeps/sparc/sparc64/qp_xtoq.c: New file.
-	* sysdeps/sparc/sparc64/qp_sqrt.c: New file.
-	* sysdeps/sparc/sparc64/s_ilogbl.c: New file.
-	* sysdeps/sparc/sparc64/s_scalblnl.c: New file.
-	* sysdeps/sparc/sparc64/s_scalbnl.c: New file.
-	* sysdeps/sparc/sparc64/qp_util.c: New file.
-	* sysdeps/sparc/sparc64/qp_neg.S: New file.
-	* sysdeps/sparc/sparc64/qp_uitoq.c: New file.
-	* sysdeps/sparc/sparc64/qp_qtoui.c: New file.
-	* sysdeps/sparc/sparc32/sfp-machine.h: New file.
-	* sysdeps/sparc/sparc32/Makefile: New file.
-	* sysdeps/sparc/sparc32/q_qtox.c: New file.
-	* sysdeps/sparc/sparc32/q_cmp.c: New file.
-	* sysdeps/sparc/sparc32/q_dtoq.c: New file.
-	* sysdeps/sparc/sparc32/q_feq.c: New file.
-	* sysdeps/sparc/sparc32/q_fge.c: New file.
-	* sysdeps/sparc/sparc32/q_fgt.c: New file.
-	* sysdeps/sparc/sparc32/q_flt.c: New file.
-	* sysdeps/sparc/sparc32/q_mul.c: New file.
-	* sysdeps/sparc/sparc32/q_neg.c: New file.
-	* sysdeps/sparc/sparc32/q_qtod.c: New file.
-	* sysdeps/sparc/sparc32/q_qtoi.c: New file.
-	* sysdeps/sparc/sparc32/q_qtos.c: New file.
-	* sysdeps/sparc/sparc32/q_qtoui.c: New file.
-	* sysdeps/sparc/sparc32/q_sqrt.c: New file.
-	* sysdeps/sparc/sparc32/q_sub.c: New file.
-	* sysdeps/sparc/sparc32/q_uitoq.c: New file.
-	* sysdeps/sparc/sparc32/q_itoq.c: New file.
-	* sysdeps/sparc/sparc32/q_cmpe.c: New file.
-	* sysdeps/sparc/sparc32/q_xtoq.c: New file.
-	* sysdeps/sparc/sparc32/q_fle.c: New file.
-	* sysdeps/sparc/sparc32/q_div.c: New file.
-	* sysdeps/sparc/sparc32/q_stoq.c: New file.
-	* sysdeps/sparc/sparc32/q_fne.c: New file.
-	* sysdeps/sparc/sparc32/q_uxtoq.c: New file.
-	* sysdeps/sparc/sparc32/q_util.c: New file.
-	* sysdeps/sparc/sparc32/q_qtoux.c: New file.
-	* sysdeps/sparc/sparc32/q_add.c: New file.
-	* sysdeps/mips/sfp-machine.h: New file.
-	* sysdeps/mips/mips64/sfp-machine.h: New file.
-	* sysdeps/powerpc/sfp-machine.h: New file.
diff --git a/sysdeps/powerpc/Makefile b/sysdeps/powerpc/Makefile
index 3bad48811e..67ea942c94 100644
--- a/sysdeps/powerpc/Makefile
+++ b/sysdeps/powerpc/Makefile
@@ -41,6 +41,6 @@ CFLAGS-memcmp.c += -Wno-uninitialized
 endif
 
 ifeq ($(subdir),elf)
-dl-routines += dl-machine
-rtld-routines += dl-machine dl-start
+sysdep-dl-routines += dl-machine
+sysdep_routines += dl-machine dl-start
 endif