5 files changed, 4 insertions, 21 deletions
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index b0780a3..96730fe 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -39,7 +39,10 @@ NOASM=
 .include "${.CURDIR}/net/Makefile.inc"
 .include "${.CURDIR}/nls/Makefile.inc"
 .include "${.CURDIR}/posix1e/Makefile.inc"
-.if !defined(NO_QUAD)
+.if ${MACHINE_ARCH} != "alpha" && \
+    ${MACHINE_ARCH} != "amd64" && \
+    ${MACHINE_ARCH} != "ia64" && \
+    ${MACHINE_ARCH} != "sparc64"
 .include "${.CURDIR}/quad/Makefile.inc"
 .endif
 .include "${.CURDIR}/regex/Makefile.inc"
diff --git a/lib/libc/alpha/Makefile.inc b/lib/libc/alpha/Makefile.inc
index 2898559..49f6a3e 100644
--- a/lib/libc/alpha/Makefile.inc
+++ b/lib/libc/alpha/Makefile.inc
@@ -3,11 +3,6 @@
 # Machine dependent definitions for the alpha architecture.
 #
 
-#
-# 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
 SYM_MAPS+=${.CURDIR}/alpha/Symbol.map
diff --git a/lib/libc/amd64/Makefile.inc b/lib/libc/amd64/Makefile.inc
index 43bce08..e3f0c48 100644
--- a/lib/libc/amd64/Makefile.inc
+++ b/lib/libc/amd64/Makefile.inc
@@ -3,11 +3,6 @@
 # Machine dependent definitions for the amd64 architecture.
 #
 
-#
-# 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/ia64/Makefile.inc b/lib/libc/ia64/Makefile.inc
index 4ba7d68..791bf45 100644
--- a/lib/libc/ia64/Makefile.inc
+++ b/lib/libc/ia64/Makefile.inc
@@ -3,11 +3,6 @@
 # Machine dependent definitions for the alpha architecture.
 #
 
-#
-# 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/sparc64/Makefile.inc b/lib/libc/sparc64/Makefile.inc
index 063ceaf..2b9d3ab 100644
--- a/lib/libc/sparc64/Makefile.inc
+++ b/lib/libc/sparc64/Makefile.inc
@@ -5,11 +5,6 @@
 
 .include "fpu/Makefile.inc"
 
-#
-# 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