From c3fb59ed5c5f5cad5fed5bc9f290a2a942838699 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 5 Oct 2022 17:26:31 +0100
Subject: [PATCH] libc: Include quad support on long32 ABIs

Rather than not including it on all 64-bit platforms, just include it on
32-bit ones.

Reviewed by:	imp, jhb
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D36422
---
 lib/libc/Makefile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index a221a5a66c19..c9150869f223 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -109,10 +109,7 @@ NOASM=
 .include "${LIBC_SRCTOP}/net/Makefile.inc"
 .include "${LIBC_SRCTOP}/nls/Makefile.inc"
 .include "${LIBC_SRCTOP}/posix1e/Makefile.inc"
-.if ${LIBC_ARCH} != "aarch64" && \
-    ${LIBC_ARCH} != "amd64" && \
-    ${LIBC_ARCH} != "powerpc64" && \
-    ${LIBC_ARCH} != "riscv"
+.if ${MACHINE_ABI:Mlong32}
 .include "${LIBC_SRCTOP}/quad/Makefile.inc"
 .endif
 .include "${LIBC_SRCTOP}/regex/Makefile.inc"