From bd15659f64eb4460b85f395a176de9d4fcf40ecb Mon Sep 17 00:00:00 2001 From: David Schultz Date: Sat, 15 Jan 2005 05:23:58 +0000 Subject: 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. --- lib/libc/Makefile | 6 ------ lib/libc/alpha/Makefile.inc | 3 +++ lib/libc/alpha/stdlib/gdtoa.mk | 4 ---- lib/libc/amd64/Makefile.inc | 4 ++++ lib/libc/amd64/stdlib/gdtoa.mk | 5 ----- lib/libc/arm/Makefile.inc | 4 ++++ lib/libc/arm/stdlib/gdtoa.mk | 5 ----- lib/libc/gdtoa/Makefile.inc | 5 +---- lib/libc/i386/Makefile.inc | 5 +++++ lib/libc/i386/stdlib/gdtoa.mk | 5 ----- lib/libc/ia64/Makefile.inc | 4 ++++ lib/libc/ia64/stdlib/gdtoa.mk | 5 ----- lib/libc/powerpc/stdlib/gdtoa.mk | 4 ---- lib/libc/sparc64/Makefile.inc | 4 ++++ lib/libc/sparc64/stdlib/gdtoa.mk | 5 ----- 15 files changed, 25 insertions(+), 43 deletions(-) delete mode 100644 lib/libc/alpha/stdlib/gdtoa.mk delete mode 100644 lib/libc/amd64/stdlib/gdtoa.mk delete mode 100644 lib/libc/arm/stdlib/gdtoa.mk create mode 100644 lib/libc/i386/Makefile.inc delete mode 100644 lib/libc/i386/stdlib/gdtoa.mk delete mode 100644 lib/libc/ia64/stdlib/gdtoa.mk delete mode 100644 lib/libc/powerpc/stdlib/gdtoa.mk delete mode 100644 lib/libc/sparc64/stdlib/gdtoa.mk diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 169a366642c5..d86c16fe4801 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 eff6caf6a280..c01413623223 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 c631f6440422..000000000000 --- 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 0f14cafc35cb..954a02552342 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/amd64/stdlib/gdtoa.mk b/lib/libc/amd64/stdlib/gdtoa.mk deleted file mode 100644 index 50f2f0d0b3b1..000000000000 --- a/lib/libc/amd64/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/arm/Makefile.inc b/lib/libc/arm/Makefile.inc index 1a0ef65bb209..c1cf60b06388 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 50f2f0d0b3b1..000000000000 --- 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 219063657af8..395faf93f3a0 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/i386/Makefile.inc b/lib/libc/i386/Makefile.inc new file mode 100644 index 000000000000..50f2f0d0b3b1 --- /dev/null +++ b/lib/libc/i386/Makefile.inc @@ -0,0 +1,5 @@ +# $FreeBSD$ + +# Long double is 80 bits +GDTOASRCS+=strtopx.c +MDSRCS+=machdep_ldisx.c diff --git a/lib/libc/i386/stdlib/gdtoa.mk b/lib/libc/i386/stdlib/gdtoa.mk deleted file mode 100644 index 50f2f0d0b3b1..000000000000 --- 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 5c60862de06f..aef1c282ca52 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 50f2f0d0b3b1..000000000000 --- 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 726531d84360..000000000000 --- 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 afacb91ed60d..d47f8865b326 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 f951a8dcad6b..000000000000 --- 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 -- cgit v1.2.3