* a29k/t-a29kbare: Fix some comments.

	(LIB2FUNCS_EXTRA): Remove fp-bit.c and dp-bit.c
	(FPBIT, DPBIT): Define.
	* a29k/t-vx29k: Likewise.
	* arc/t-arc: Likewise.
	* arm/t-arm-elf: Likewise.
	* arm/t-bare: Likewise.
	* arm/t-pe: Likewise.
	* arm/t-pe-thumb: Likewise.
	* arm/t-semi: Likewise.
	* arm/t-thumb: Likewise.
	* arm/t-thumb-elf: Likewise.
	* arm/t-thumb-linux: Likewise.
	* h8300/t-h8300: Likewise.
	* i960/t-i960: Likewise.
	* i960/t-vxworks960: Likewise.
	* m32r/t-m32r: Likewise.
	* mips/t-ecoff: Likewise.
	* mips/t-elf: Likewise.
	* mips/t-r3900: Likewise.
	* pa/t-pro: Likewise.
	* rs6000/t-aix43: Likewise.
	* rs6000/t-beos: Likewise.
	* rs6000/t-newas: Likewise.
	* rs6000/t-ppccomm: Likewise.
	* rs6000/t-rs6000: Likewise.
	* rs6000/t-winnt: Likewise.
	* rs6000/t-xnewas: Likewise.
	* rs6000/t-xrs6000: Likewise.
	* sh/t-sh: Likewise.
	* sparc/t-elf: Likewise.
	* sparc/t-sparcbare: Likewise.
	* sparc/t-sparclite: Likewise.
	* sparc/t-splet: Likewise.
	* v850/t-v850: Likewise.
	* mn10200/t-mn10200: Fix comments.
	* mn10300/t-mn10300: Likewise.


git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@28518 138bc75d-0d04-0410-961f-82ee72b054a4

36 files changed, 183 insertions, 99 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d414f6af217..07d6b585a2a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -69,6 +69,44 @@ Wed Aug  4 12:53:44 1999  Michael Tiemann  <tiemann@holodeck.cygnus.com>
 
 Wed Aug  4 13:12:17 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* a29k/t-a29kbare: Fix some comments.
+	(LIB2FUNCS_EXTRA): Remove fp-bit.c and dp-bit.c
+	(FPBIT, DPBIT): Define.
+	* a29k/t-vx29k: Likewise.
+	* arc/t-arc: Likewise.
+	* arm/t-arm-elf: Likewise.
+	* arm/t-bare: Likewise.
+	* arm/t-pe: Likewise.
+	* arm/t-pe-thumb: Likewise.
+	* arm/t-semi: Likewise.
+	* arm/t-thumb: Likewise.
+	* arm/t-thumb-elf: Likewise.
+	* arm/t-thumb-linux: Likewise.
+	* h8300/t-h8300: Likewise.
+	* i960/t-i960: Likewise.
+	* i960/t-vxworks960: Likewise.
+	* m32r/t-m32r: Likewise.
+	* mips/t-ecoff: Likewise.
+	* mips/t-elf: Likewise.
+	* mips/t-r3900: Likewise.
+	* pa/t-pro: Likewise.
+	* rs6000/t-aix43: Likewise.
+	* rs6000/t-beos: Likewise.
+	* rs6000/t-newas: Likewise.
+	* rs6000/t-ppccomm: Likewise.
+	* rs6000/t-rs6000: Likewise.
+	* rs6000/t-winnt: Likewise.
+	* rs6000/t-xnewas: Likewise.
+	* rs6000/t-xrs6000: Likewise.
+	* sh/t-sh: Likewise.
+	* sparc/t-elf: Likewise.
+	* sparc/t-sparcbare: Likewise.
+	* sparc/t-sparclite: Likewise.
+	* sparc/t-splet: Likewise.
+	* v850/t-v850: Likewise.
+	* mn10200/t-mn10200: Fix comments.
+	* mn10300/t-mn10300: Likewise.
+
 	* pa.md (divsi3, udivsi3, modsi3, umodsi3 expanders): Clobber a new
 	dummy operand.  Allocate a new pseudo for the dummy operand.
 	(divsi3, udivsi3, modis3, umodsi3 patterns): Corresponding changes.
diff --git a/gcc/config/a29k/t-a29kbare b/gcc/config/a29k/t-a29kbare
index 21ba24f86e8..c6702348d14 100644
--- a/gcc/config/a29k/t-a29kbare
+++ b/gcc/config/a29k/t-a29kbare
@@ -4,10 +4,10 @@ CROSS_LIBGCC1 =
 # We need crt0.o.
 LIBGCC1_TEST =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so... 
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/a29k/t-vx29k b/gcc/config/a29k/t-vx29k
index 293674efd4b..298871e4122 100644
--- a/gcc/config/a29k/t-vx29k
+++ b/gcc/config/a29k/t-vx29k
@@ -7,7 +7,11 @@ LIBGCC1_TEST =
 # We don't want to put exit in libgcc.a for VxWorks, because VxWorks
 # does not have _exit.
 TARGET_LIBGCC2_CFLAGS = -Dexit=unused_exit
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/arc/t-arc b/gcc/config/arc/t-arc
index d922c27ca5f..339e25c1fc2 100644
--- a/gcc/config/arc/t-arc
+++ b/gcc/config/arc/t-arc
@@ -7,10 +7,10 @@ LIB1ASMFUNCS = _mulsi3 _umulsidi3 _udivsi3 _divsi3 _umodsi3 _modsi3 _divmod_tool
 # ??? -mmangle-cpu passed by default for now.
 #LIBGCC2_CFLAGS = -g1 -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) -mmangle-cpu
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#ifndef __big_endian__' > dp-bit.c
diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf
index ee727fe3842..eb77fc5b7e3 100644
--- a/gcc/config/arm/t-arm-elf
+++ b/gcc/config/arm/t-arm-elf
@@ -2,10 +2,10 @@ CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = arm/lib1funcs.asm
 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/arm/t-bare b/gcc/config/arm/t-bare
index 85e6a301aa7..71062ee9458 100644
--- a/gcc/config/arm/t-bare
+++ b/gcc/config/arm/t-bare
@@ -2,10 +2,10 @@ CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = arm/lib1funcs.asm
 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/arm/t-pe b/gcc/config/arm/t-pe
index e68b3c90e75..0ffcfffaab3 100644
--- a/gcc/config/arm/t-pe
+++ b/gcc/config/arm/t-pe
@@ -2,10 +2,10 @@ CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = arm/lib1funcs.asm
 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _call_via_rX _interwork_call_via_rX
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/arm/t-pe-thumb b/gcc/config/arm/t-pe-thumb
index c75930c8c6b..d12beadc598 100644
--- a/gcc/config/arm/t-pe-thumb
+++ b/gcc/config/arm/t-pe-thumb
@@ -5,10 +5,10 @@ CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = arm/lib1thumb.asm
 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _call_via_rX _interwork_call_via_rX
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/arm/t-semi b/gcc/config/arm/t-semi
index ade87003cab..bc793e8bcfa 100644
--- a/gcc/config/arm/t-semi
+++ b/gcc/config/arm/t-semi
@@ -17,10 +17,10 @@ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _call_via_rX _interwo
 #Don't try to run fixproto
 STMP_FIXPROTO =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#ifdef __SOFTFP__' > fp-bit.c
diff --git a/gcc/config/arm/t-thumb b/gcc/config/arm/t-thumb
index 6b349e2fdf0..eb3e0111a8d 100644
--- a/gcc/config/arm/t-thumb
+++ b/gcc/config/arm/t-thumb
@@ -4,10 +4,10 @@ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _call_via_rX _interwo
 # adddi3/subdi3 added to machine description
 #LIB1ASMFUNCS = _adddi3 _subdi3 _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/arm/t-thumb-elf b/gcc/config/arm/t-thumb-elf
index 3e608ab1c80..302a20be1ab 100644
--- a/gcc/config/arm/t-thumb-elf
+++ b/gcc/config/arm/t-thumb-elf
@@ -3,10 +3,10 @@ LIB1ASMSRC = arm/lib1thumb.asm
 LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _call_via_rX _interwork_call_via_rX
 # adddi3/subdi3 added to machine description
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/arm/t-thumb-linux b/gcc/config/arm/t-thumb-linux
index 3cde74ccf97..e028ac04c4e 100644
--- a/gcc/config/arm/t-thumb-linux
+++ b/gcc/config/arm/t-thumb-linux
@@ -21,7 +21,10 @@ EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o
 LIBGCC = stmp-multilib
 INSTALL_LIBGCC = install-multilib
 
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/h8300/t-h8300 b/gcc/config/h8300/t-h8300
index e220048d774..fbc4d731440 100644
--- a/gcc/config/h8300/t-h8300
+++ b/gcc/config/h8300/t-h8300
@@ -5,7 +5,9 @@ LIB1ASMFUNCS = _cmpsi2 _ucmpsi2 _divhi3 _divsi3 _mulhi3 _mulsi3
 # We do not have DF or DI types, so fake out the libgcc2 compilation.
 TARGET_LIBGCC2_CFLAGS = -DDF=SF -DDI=SI
 
-LIB2FUNCS_EXTRA = fp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
 
 fp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT' > fp-bit.c
diff --git a/gcc/config/i960/t-960bare b/gcc/config/i960/t-960bare
index 37929bb07f8..5c6b8274bb6 100644
--- a/gcc/config/i960/t-960bare
+++ b/gcc/config/i960/t-960bare
@@ -1,7 +1,12 @@
 LIBGCC1 =
 CROSS_LIBGCC1 =
 
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c xp-bit.c
+LIB2FUNCS_EXTRA = xp-bit.c
+
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT_BIT_ORDER_MISMATCH' > dp-bit.c
diff --git a/gcc/config/i960/t-vxworks960 b/gcc/config/i960/t-vxworks960
index 851e7bd1fec..43949fa4f84 100644
--- a/gcc/config/i960/t-vxworks960
+++ b/gcc/config/i960/t-vxworks960
@@ -4,7 +4,12 @@ CROSS_LIBGCC1 =
 # We don't want to put exit in libgcc.a for VxWorks, because VxWorks
 # does not have _exit.
 TARGET_LIBGCC2_CFLAGS = -Dexit=unused_exit
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c xp-bit.c
+LIB2FUNCS_EXTRA = xp-bit.c
+
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define FLOAT_BIT_ORDER_MISMATCH' > dp-bit.c
diff --git a/gcc/config/m32r/t-m32r b/gcc/config/m32r/t-m32r
index 4b8f417efa0..5a60e18adc1 100644
--- a/gcc/config/m32r/t-m32r
+++ b/gcc/config/m32r/t-m32r
@@ -1,10 +1,10 @@
 # lib1funcs.asm is currently empty.
 CROSS_LIBGCC1 =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 # Turn off the SDA while compiling libgcc2.  There are no headers for it
 # and we want maximal upward compatibility here.
diff --git a/gcc/config/mips/t-ecoff b/gcc/config/mips/t-ecoff
index 8de03ffd758..55855a0ed85 100644
--- a/gcc/config/mips/t-ecoff
+++ b/gcc/config/mips/t-ecoff
@@ -32,7 +32,10 @@ TARGET_LIBGCC2_CFLAGS = -G 0
 
 # fp-bit and dp-bit are really part of libgcc1, but this will cause
 # them to be built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#ifdef __MIPSEL__' > dp-bit.c
diff --git a/gcc/config/mips/t-elf b/gcc/config/mips/t-elf
index dd01b7fd4a7..416e39a7ba0 100644
--- a/gcc/config/mips/t-elf
+++ b/gcc/config/mips/t-elf
@@ -36,7 +36,10 @@ TARGET_LIBGCC2_CFLAGS = -G 0
 
 # fp-bit and dp-bit are really part of libgcc1, but this will cause
 # them to be built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#ifdef __MIPSEL__' > dp-bit.c
diff --git a/gcc/config/mips/t-r3900 b/gcc/config/mips/t-r3900
index 055143ff05c..ebc249ed5a6 100644
--- a/gcc/config/mips/t-r3900
+++ b/gcc/config/mips/t-r3900
@@ -32,7 +32,10 @@ TARGET_LIBGCC2_CFLAGS = -G 0
 
 # fp-bit and dp-bit are really part of libgcc1, but this will cause
 # them to be built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#ifdef __MIPSEL__' > dp-bit.c
diff --git a/gcc/config/mn10200/t-mn10200 b/gcc/config/mn10200/t-mn10200
index d02d1513d93..f27815a2dc0 100644
--- a/gcc/config/mn10200/t-mn10200
+++ b/gcc/config/mn10200/t-mn10200
@@ -31,9 +31,6 @@ LIB1ASMFUNCS    = _divhi3 \
 		  _epilogue_noreturn
 
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
 # We do not have DF or DI types, so fake out the libgcc2 compilation.
 TARGET_LIBGCC2_CFLAGS=-DDF=SF -DDI=SI
 LIB2FUNCS_EXTRA = $(srcdir)/config/mn10200/udivmodsi4.c \
diff --git a/gcc/config/mn10300/t-mn10300 b/gcc/config/mn10300/t-mn10300
index 7e94656c223..5dbb46f5cb0 100644
--- a/gcc/config/mn10300/t-mn10300
+++ b/gcc/config/mn10300/t-mn10300
@@ -1,9 +1,6 @@
 LIBGCC1=libgcc1.null
 CROSS_LIBGCC1=libgcc1.null
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
 # We want fine grained libraries, so use the new code to build the
 # floating point emulation libraries.
 FPBIT = fp-bit.c
diff --git a/gcc/config/pa/t-pro b/gcc/config/pa/t-pro
index e68fd179c82..26ced7e73dd 100644
--- a/gcc/config/pa/t-pro
+++ b/gcc/config/pa/t-pro
@@ -7,7 +7,13 @@ LIBGCC1_TEST =
 
 ADA_CFLAGS=-mdisable-indexing
 
-LIB2FUNCS_EXTRA=fp-bit.c dp-bit.c lib2funcs.asm 
+LIB2FUNCS_EXTRA=lib2funcs.asm 
+
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
+
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-aix43 b/gcc/config/rs6000/t-aix43
index c4e36316d50..8897c562635 100644
--- a/gcc/config/rs6000/t-aix43
+++ b/gcc/config/rs6000/t-aix43
@@ -2,9 +2,10 @@
 LIBGCC1 =
 CROSS_LIBGCC1 =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-beos b/gcc/config/rs6000/t-beos
index 1436108ab14..b9b578ce2b8 100644
--- a/gcc/config/rs6000/t-beos
+++ b/gcc/config/rs6000/t-beos
@@ -2,9 +2,10 @@
 LIBGCC1 =
 CROSS_LIBGCC1 =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-newas b/gcc/config/rs6000/t-newas
index 823b03b4b56..cadcb95d347 100644
--- a/gcc/config/rs6000/t-newas
+++ b/gcc/config/rs6000/t-newas
@@ -2,9 +2,10 @@
 LIBGCC1 =
 CROSS_LIBGCC1 =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-ppccomm b/gcc/config/rs6000/t-ppccomm
index 9ed1690f985..408f535f85d 100644
--- a/gcc/config/rs6000/t-ppccomm
+++ b/gcc/config/rs6000/t-ppccomm
@@ -6,7 +6,13 @@ CROSS_LIBGCC1 =
 
 # These are really part of libgcc1, but this will cause them to be
 # built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c eabi.S eabi-ctors.c tramp.S
+LIB2FUNCS_EXTRA = eabi.S eabi-ctors.c tramp.S
+
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
+
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-rs6000 b/gcc/config/rs6000/t-rs6000
index 4c659a629d7..98f4473c48c 100644
--- a/gcc/config/rs6000/t-rs6000
+++ b/gcc/config/rs6000/t-rs6000
@@ -2,9 +2,10 @@
 LIBGCC1 =
 CROSS_LIBGCC1 =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-winnt b/gcc/config/rs6000/t-winnt
index f58aefed523..1aafae47422 100644
--- a/gcc/config/rs6000/t-winnt
+++ b/gcc/config/rs6000/t-winnt
@@ -6,7 +6,13 @@ EXTRA_PARTS = crti.o crtn.o
 
 # These are really part of libgcc1, but this will cause them to be
 # built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c ntstack.S
+LIB2FUNCS_EXTRA = ntstack.S
+
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
+
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-xnewas b/gcc/config/rs6000/t-xnewas
index 285f8259d07..219eaf3079f 100644
--- a/gcc/config/rs6000/t-xnewas
+++ b/gcc/config/rs6000/t-xnewas
@@ -8,9 +8,10 @@ LIBGCC1_TEST =
 LIBGCC1 =
 CROSS_LIBGCC1 =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/rs6000/t-xrs6000 b/gcc/config/rs6000/t-xrs6000
index f5d34d658b7..fc6cc602632 100644
--- a/gcc/config/rs6000/t-xrs6000
+++ b/gcc/config/rs6000/t-xrs6000
@@ -8,9 +8,10 @@ LIBGCC1_TEST =
 LIBGCC1 =
 CROSS_LIBGCC1 =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so... [taken from t-sparclite]
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/sh/t-sh b/gcc/config/sh/t-sh
index bfbf45ea6a0..ebe013e31f9 100644
--- a/gcc/config/sh/t-sh
+++ b/gcc/config/sh/t-sh
@@ -3,10 +3,10 @@ LIB1ASMSRC = sh/lib1funcs.asm
 LIB1ASMFUNCS = _ashiftrt _ashiftrt_n _ashiftlt _lshiftrt _movstr \
   _movstr_i4 _mulsi3 _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#ifdef __LITTLE_ENDIAN__' > dp-bit.c
diff --git a/gcc/config/sparc/t-elf b/gcc/config/sparc/t-elf
index da9df38368e..d05f9907a12 100644
--- a/gcc/config/sparc/t-elf
+++ b/gcc/config/sparc/t-elf
@@ -8,10 +8,10 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
 # crt0 is built elsewhere
 LIBGCC1_TEST =
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/sparc/t-sparcbare b/gcc/config/sparc/t-sparcbare
index 8bd978b068d..01562b24b7c 100644
--- a/gcc/config/sparc/t-sparcbare
+++ b/gcc/config/sparc/t-sparcbare
@@ -4,10 +4,10 @@ CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = sparc/lb1spc.asm
 LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/sparc/t-sparclite b/gcc/config/sparc/t-sparclite
index 7cdfbb04551..b5ccbb1e99f 100644
--- a/gcc/config/sparc/t-sparclite
+++ b/gcc/config/sparc/t-sparclite
@@ -2,10 +2,10 @@ CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = sparc/lb1spl.asm
 LIB1ASMFUNCS = _divsi3 _udivsi3 _modsi3 _umodsi3
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#define US_SOFTWARE_GOFAST' > dp-bit.c
diff --git a/gcc/config/sparc/t-splet b/gcc/config/sparc/t-splet
index 3329e0bef07..ecead404966 100644
--- a/gcc/config/sparc/t-splet
+++ b/gcc/config/sparc/t-splet
@@ -4,10 +4,10 @@ CROSS_LIBGCC1 = libgcc1-asm.a
 LIB1ASMSRC = sparc/lb1spc.asm
 LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	cat $(srcdir)/config/fp-bit.c > dp-bit.c
diff --git a/gcc/config/v850/t-v850 b/gcc/config/v850/t-v850
index 12af46b5037..290d28b4441 100644
--- a/gcc/config/v850/t-v850
+++ b/gcc/config/v850/t-v850
@@ -33,10 +33,10 @@ LIB1ASMFUNCS	= _mulsi3 \
 		  _save_all_interrupt
 	
 
-# These are really part of libgcc1, but this will cause them to be
-# built correctly, so...
-
-LIB2FUNCS_EXTRA = fp-bit.c dp-bit.c
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
 
 dp-bit.c: $(srcdir)/config/fp-bit.c
 	echo '#ifdef __LITTLE_ENDIAN__' > dp-bit.c