From 53f08c908d7e1b4d3b877704d96f8e0ba9b398ac Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Sun, 23 Jul 2017 09:50:54 +0000
Subject: [PATCH] Do not use IEEE 754 specific functions for VAX

---
 lib/libc/compiler_rt/Makefile.inc | 95 +++++++++++++++++--------------
 1 file changed, 51 insertions(+), 44 deletions(-)

diff --git a/lib/libc/compiler_rt/Makefile.inc b/lib/libc/compiler_rt/Makefile.inc
index 4fd46fb5c2b4..436639fbd9ff 100644
--- a/lib/libc/compiler_rt/Makefile.inc
+++ b/lib/libc/compiler_rt/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.34 2017/06/16 21:22:14 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.35 2017/07/23 09:50:54 martin Exp $
 
 COMPILER_RT_SRCDIR=	${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
 
@@ -31,6 +31,52 @@ GENERIC_SRCS+= \
 	gcc_personality_v0.c
 .endif
 
+GENERIC_SRCS+= \
+	absvsi2.c \
+	absvti2.c \
+	addvsi3.c \
+	addvti3.c \
+	ashlti3.c \
+	ashrti3.c \
+	clzti2.c \
+	cmpti2.c \
+	ctzti2.c \
+	divti3.c \
+	ffsti2.c \
+	fixsfdi.c \
+	fixdfdi.c \
+	fixunsdfdi.c \
+	fixunsdfsi.c \
+	fixunssfdi.c \
+	fixunssfsi.c \
+	fixunsxfdi.c \
+	fixunsxfsi.c \
+	int_util.c \
+	lshrti3.c \
+	modti3.c \
+	muldc3.c \
+	mulosi4.c \
+	muloti4.c \
+	multi3.c \
+	mulvsi3.c \
+	mulvti3.c \
+	negti2.c \
+	negvsi2.c \
+	negvti2.c \
+	paritysi2.c \
+	parityti2.c \
+	popcountsi2.c \
+	popcountti2.c \
+	subvsi3.c \
+	subvti3.c \
+	ucmpti2.c \
+	udivmodti4.c \
+	udivti3.c \
+	umodti3.c
+
+# only used for machines using IEEE 754 floating point formats
+.if ${MACHINE_ARCH} != "vax"
+
 .if 0
 # Conflicts with soft-float
 GENERIC_SRCS+= \
@@ -64,60 +110,21 @@ GENERIC_SRCS+= \
 	trunctfsf2.c
 .endif
 
-GENERIC_SRCS+= \
-	absvsi2.c \
-	absvti2.c \
-	addvsi3.c \
-	addvti3.c \
-	ashlti3.c \
-	ashrti3.c \
-	clzti2.c \
-	cmpti2.c \
-	ctzti2.c \
-	divti3.c \
-	ffsti2.c \
-	fixsfdi.c \
-	fixdfdi.c \
-	fixunsdfdi.c \
-	fixunsdfsi.c \
-	fixunssfdi.c \
-	fixunssfsi.c \
-	fixunsxfdi.c \
-	fixunsxfsi.c \
+GENERIC_SRCS+=	\
 	floatdidf.c \
 	floatdisf.c \
 	floatdixf.c \
 	floatundidf.c \
 	floatundisf.c \
 	floatundixf.c \
-	int_util.c \
-	lshrti3.c \
-	modti3.c \
-	muldc3.c \
-	mulosi4.c \
-	muloti4.c \
-	multi3.c \
-	mulvsi3.c \
-	mulvti3.c \
 	negdf2.c \
 	negsf2.c \
-	negti2.c \
-	negvsi2.c \
-	negvti2.c \
-	paritysi2.c \
-	parityti2.c \
-	popcountsi2.c \
-	popcountti2.c \
 	powidf2.c \
 	powisf2.c \
 	powitf2.c \
-	powixf2.c \
-	subvsi3.c \
-	subvti3.c \
-	ucmpti2.c \
-	udivmodti4.c \
-	udivti3.c \
-	umodti3.c
+	powixf2.c
+
+.endif # IEEE 754 only machines
 
 .if ${MACHINE_ARCH} != "m68k"
 GENERIC_SRCS+= \