Eliminate gdtoa.mk and move its contents to ${MACHINE_ARCH}/Makefile.inc.

The purpose of having a separate file involved an abandoned scheme that
would have kept contrib/gdtoa out of the include path for the rest of libc.

14 files changed, 20 insertions, 38 deletions

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 169a366..d86c16f 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -27,13 +27,7 @@ MDASM=
 MIASM=
 NOASM=
 
-#
-# If there is a machine dependent makefile, use it:
-#
-.if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc)
 .include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc"
-.endif
-
 .include "${.CURDIR}/db/Makefile.inc"
 .include "${.CURDIR}/compat-43/Makefile.inc"
 .include "${.CURDIR}/gdtoa/Makefile.inc"
diff --git a/lib/libc/alpha/Makefile.inc b/lib/libc/alpha/Makefile.inc
index eff6caf..c014136 100644
--- a/lib/libc/alpha/Makefile.inc
+++ b/lib/libc/alpha/Makefile.inc
@@ -7,3 +7,6 @@
 # Alpha is 64-bit, so it doesn't need quad functions:
 #
 NO_QUAD=
+
+# On Alpha, long double is just double precision.
+MDSRCS+=machdep_ldisd.c
diff --git a/lib/libc/alpha/stdlib/gdtoa.mk b/lib/libc/alpha/stdlib/gdtoa.mk
deleted file mode 100644
index c631f64..0000000
--- a/lib/libc/alpha/stdlib/gdtoa.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-# On Alpha, long double is just double precision.
-MDSRCS+=machdep_ldisd.c
diff --git a/lib/libc/amd64/Makefile.inc b/lib/libc/amd64/Makefile.inc
index 0f14caf..954a025 100644
--- a/lib/libc/amd64/Makefile.inc
+++ b/lib/libc/amd64/Makefile.inc
@@ -7,3 +7,7 @@
 # AMD64 is 64-bit, so it doesn't need quad functions:
 #
 NO_QUAD=
+
+# Long double is 80 bits
+GDTOASRCS+=strtopx.c
+MDSRCS+=machdep_ldisx.c
diff --git a/lib/libc/arm/Makefile.inc b/lib/libc/arm/Makefile.inc
index 1a0ef65..c1cf60b 100644
--- a/lib/libc/arm/Makefile.inc
+++ b/lib/libc/arm/Makefile.inc
@@ -6,3 +6,7 @@
 SOFTFLOAT_BITS=32
 
 CFLAGS+=-DSOFTFLOAT
+
+# Long double is 80 bits
+GDTOASRCS+=strtopx.c
+MDSRCS+=machdep_ldisx.c
diff --git a/lib/libc/arm/stdlib/gdtoa.mk b/lib/libc/arm/stdlib/gdtoa.mk
deleted file mode 100644
index 50f2f0d..0000000
--- a/lib/libc/arm/stdlib/gdtoa.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-# Long double is 80 bits
-GDTOASRCS+=strtopx.c
-MDSRCS+=machdep_ldisx.c
diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc
index 2190636..395faf9 100644
--- a/lib/libc/gdtoa/Makefile.inc
+++ b/lib/libc/gdtoa/Makefile.inc
@@ -4,12 +4,9 @@
 .PATH: ${.CURDIR}/gdtoa
 
 MISRCS+=_hdtoa.c _ldtoa.c glue.c
-GDTOASRCS=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \
+GDTOASRCS+=dmisc.c dtoa.c gdtoa.c gethex.c gmisc.c \
 	hd_init.c hexnan.c misc.c smisc.c \
 	strtoIg.c strtod.c strtodg.c strtof.c strtord.c sum.c ulp.c
-.if exists(${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk)
-.include "${.CURDIR}/${MACHINE_ARCH}/stdlib/gdtoa.mk"
-.endif
 
 CFLAGS+=-I${.CURDIR}/../../contrib/gdtoa
 
diff --git a/lib/libc/amd64/stdlib/gdtoa.mk b/lib/libc/i386/Makefile.inc
index 50f2f0d..50f2f0d 100644
--- a/lib/libc/amd64/stdlib/gdtoa.mk
+++ b/lib/libc/i386/Makefile.inc
diff --git a/lib/libc/i386/stdlib/gdtoa.mk b/lib/libc/i386/stdlib/gdtoa.mk
deleted file mode 100644
index 50f2f0d..0000000
--- a/lib/libc/i386/stdlib/gdtoa.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-# Long double is 80 bits
-GDTOASRCS+=strtopx.c
-MDSRCS+=machdep_ldisx.c
diff --git a/lib/libc/ia64/Makefile.inc b/lib/libc/ia64/Makefile.inc
index 5c60862..aef1c28 100644
--- a/lib/libc/ia64/Makefile.inc
+++ b/lib/libc/ia64/Makefile.inc
@@ -7,3 +7,7 @@
 # IA-64 is 64-bit, so it doesn't need quad functions:
 #
 NO_QUAD=
+
+# Long double is 80 bits
+GDTOASRCS+=strtopx.c
+MDSRCS+=machdep_ldisx.c
diff --git a/lib/libc/ia64/stdlib/gdtoa.mk b/lib/libc/ia64/stdlib/gdtoa.mk
deleted file mode 100644
index 50f2f0d..0000000
--- a/lib/libc/ia64/stdlib/gdtoa.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-# Long double is 80 bits
-GDTOASRCS+=strtopx.c
-MDSRCS+=machdep_ldisx.c
diff --git a/lib/libc/powerpc/stdlib/gdtoa.mk b/lib/libc/powerpc/stdlib/gdtoa.mk
deleted file mode 100644
index 726531d..0000000
--- a/lib/libc/powerpc/stdlib/gdtoa.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-# Long double is 64-bits
-MDSRCS+=machdep_ldisd.c
diff --git a/lib/libc/sparc64/Makefile.inc b/lib/libc/sparc64/Makefile.inc
index afacb91..d47f886 100644
--- a/lib/libc/sparc64/Makefile.inc
+++ b/lib/libc/sparc64/Makefile.inc
@@ -9,3 +9,7 @@
 # sparc64 is 64-bit, so it doesn't need quad functions.
 #
 NO_QUAD=
+
+# Long double is quad precision
+GDTOASRCS+=strtopQ.c
+MDSRCS+=machdep_ldisQ.c
diff --git a/lib/libc/sparc64/stdlib/gdtoa.mk b/lib/libc/sparc64/stdlib/gdtoa.mk
deleted file mode 100644
index f951a8d..0000000
--- a/lib/libc/sparc64/stdlib/gdtoa.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-# Long double is quad precision
-GDTOASRCS+=strtopQ.c
-MDSRCS+=machdep_ldisQ.c