Module Name: src Committed By: matt Date: Sun Aug 5 04:28:58 UTC 2012
Modified Files: src/lib/libc/gen: fixunsdfsi_ieee754.c fixunssfsi_ieee754.c fixunstfsi_ieee754.c src/lib/libc/quad: fixdfdi.c fixsfdi.c fixunsdfdi.c fixunssfdi.c floatdidf.c floatdisf.c floatundidf.c floatundisf.c floatunditf_ieee754.c Log Message: If compiling for SOFTFLOAT, include "softfloat/softfloat-for-gcc.h" so we can pick any redefinitions of the function (for ARM EABI). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/gen/fixunsdfsi_ieee754.c \ src/lib/libc/gen/fixunssfsi_ieee754.c \ src/lib/libc/gen/fixunstfsi_ieee754.c cvs rdiff -u -r1.5 -r1.6 src/lib/libc/quad/fixdfdi.c cvs rdiff -u -r1.4 -r1.5 src/lib/libc/quad/fixsfdi.c cvs rdiff -u -r1.9 -r1.10 src/lib/libc/quad/fixunsdfdi.c cvs rdiff -u -r1.7 -r1.8 src/lib/libc/quad/fixunssfdi.c cvs rdiff -u -r1.8 -r1.9 src/lib/libc/quad/floatdidf.c \ src/lib/libc/quad/floatdisf.c cvs rdiff -u -r1.2 -r1.3 src/lib/libc/quad/floatundidf.c \ src/lib/libc/quad/floatundisf.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/quad/floatunditf_ieee754.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libc/gen/fixunsdfsi_ieee754.c diff -u src/lib/libc/gen/fixunsdfsi_ieee754.c:1.1 src/lib/libc/gen/fixunsdfsi_ieee754.c:1.2 --- src/lib/libc/gen/fixunsdfsi_ieee754.c:1.1 Sat Jul 9 02:30:27 2011 +++ src/lib/libc/gen/fixunsdfsi_ieee754.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fixunsdfsi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $ */ +/* $NetBSD: fixunsdfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: fixunsdfsi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $"); +__RCSID("$NetBSD: fixunsdfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #include <stdbool.h> @@ -39,6 +39,10 @@ __RCSID("$NetBSD: fixunsdfsi_ieee754.c,v #include <float.h> #include <machine/ieee.h> +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + uint32_t __fixunsgen32(int, bool, size_t, size_t, const uint32_t *); uint32_t __fixunsdfsi(double); Index: src/lib/libc/gen/fixunssfsi_ieee754.c diff -u src/lib/libc/gen/fixunssfsi_ieee754.c:1.1 src/lib/libc/gen/fixunssfsi_ieee754.c:1.2 --- src/lib/libc/gen/fixunssfsi_ieee754.c:1.1 Sat Jul 9 02:30:27 2011 +++ src/lib/libc/gen/fixunssfsi_ieee754.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fixunssfsi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $ */ +/* $NetBSD: fixunssfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: fixunssfsi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $"); +__RCSID("$NetBSD: fixunssfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #include <stdbool.h> @@ -39,6 +39,10 @@ __RCSID("$NetBSD: fixunssfsi_ieee754.c,v #include <float.h> #include <machine/ieee.h> +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + uint32_t __fixunsgen32(int, bool, size_t, size_t, const uint32_t *); uint32_t __fixunssfsi(float); Index: src/lib/libc/gen/fixunstfsi_ieee754.c diff -u src/lib/libc/gen/fixunstfsi_ieee754.c:1.1 src/lib/libc/gen/fixunstfsi_ieee754.c:1.2 --- src/lib/libc/gen/fixunstfsi_ieee754.c:1.1 Sat Jul 9 02:30:27 2011 +++ src/lib/libc/gen/fixunstfsi_ieee754.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fixunstfsi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $ */ +/* $NetBSD: fixunstfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: fixunstfsi_ieee754.c,v 1.1 2011/07/09 02:30:27 matt Exp $"); +__RCSID("$NetBSD: fixunstfsi_ieee754.c,v 1.2 2012/08/05 04:28:58 matt Exp $"); #endif /* LIBC_SCCS and not lint */ #include <stdbool.h> @@ -39,6 +39,10 @@ __RCSID("$NetBSD: fixunstfsi_ieee754.c,v #include <float.h> #include <machine/ieee.h> +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #if defined(__x86_64__) || defined(__i486__) #define FIXUNS __fixunsxfsi #else Index: src/lib/libc/quad/fixdfdi.c diff -u src/lib/libc/quad/fixdfdi.c:1.5 src/lib/libc/quad/fixdfdi.c:1.6 --- src/lib/libc/quad/fixdfdi.c:1.5 Mon Jul 4 06:23:50 2011 +++ src/lib/libc/quad/fixdfdi.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fixdfdi.c,v 1.5 2011/07/04 06:23:50 matt Exp $ */ +/* $NetBSD: fixdfdi.c,v 1.6 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)fixdfdi.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: fixdfdi.c,v 1.5 2011/07/04 06:23:50 matt Exp $"); +__RCSID("$NetBSD: fixdfdi.c,v 1.6 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" /* Index: src/lib/libc/quad/fixsfdi.c diff -u src/lib/libc/quad/fixsfdi.c:1.4 src/lib/libc/quad/fixsfdi.c:1.5 --- src/lib/libc/quad/fixsfdi.c:1.4 Thu Aug 7 16:43:16 2003 +++ src/lib/libc/quad/fixsfdi.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fixsfdi.c,v 1.4 2003/08/07 16:43:16 agc Exp $ */ +/* $NetBSD: fixsfdi.c,v 1.5 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992 The Regents of the University of California. @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)fixsfdi.c 5.1 (Berkeley) 7/7/92"; #else -__RCSID("$NetBSD: fixsfdi.c,v 1.4 2003/08/07 16:43:16 agc Exp $"); +__RCSID("$NetBSD: fixsfdi.c,v 1.5 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" /* Index: src/lib/libc/quad/fixunsdfdi.c diff -u src/lib/libc/quad/fixunsdfdi.c:1.9 src/lib/libc/quad/fixunsdfdi.c:1.10 --- src/lib/libc/quad/fixunsdfdi.c:1.9 Tue Mar 13 21:13:42 2012 +++ src/lib/libc/quad/fixunsdfdi.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fixunsdfdi.c,v 1.9 2012/03/13 21:13:42 christos Exp $ */ +/* $NetBSD: fixunsdfdi.c,v 1.10 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)fixunsdfdi.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: fixunsdfdi.c,v 1.9 2012/03/13 21:13:42 christos Exp $"); +__RCSID("$NetBSD: fixunsdfdi.c,v 1.10 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" #define ONE_FOURTH ((int)1 << (unsigned int)(INT_BITS - 2)) Index: src/lib/libc/quad/fixunssfdi.c diff -u src/lib/libc/quad/fixunssfdi.c:1.7 src/lib/libc/quad/fixunssfdi.c:1.8 --- src/lib/libc/quad/fixunssfdi.c:1.7 Tue Mar 13 21:13:42 2012 +++ src/lib/libc/quad/fixunssfdi.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fixunssfdi.c,v 1.7 2012/03/13 21:13:42 christos Exp $ */ +/* $NetBSD: fixunssfdi.c,v 1.8 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)fixunssfdi.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: fixunssfdi.c,v 1.7 2012/03/13 21:13:42 christos Exp $"); +__RCSID("$NetBSD: fixunssfdi.c,v 1.8 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" #define ONE_FOURTH ((int)1 << (unsigned int)(INT_BITS - 2)) Index: src/lib/libc/quad/floatdidf.c diff -u src/lib/libc/quad/floatdidf.c:1.8 src/lib/libc/quad/floatdidf.c:1.9 --- src/lib/libc/quad/floatdidf.c:1.8 Tue Mar 13 21:13:42 2012 +++ src/lib/libc/quad/floatdidf.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: floatdidf.c,v 1.8 2012/03/13 21:13:42 christos Exp $ */ +/* $NetBSD: floatdidf.c,v 1.9 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)floatdidf.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: floatdidf.c,v 1.8 2012/03/13 21:13:42 christos Exp $"); +__RCSID("$NetBSD: floatdidf.c,v 1.9 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" /* Index: src/lib/libc/quad/floatdisf.c diff -u src/lib/libc/quad/floatdisf.c:1.8 src/lib/libc/quad/floatdisf.c:1.9 --- src/lib/libc/quad/floatdisf.c:1.8 Tue Mar 13 21:13:42 2012 +++ src/lib/libc/quad/floatdisf.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: floatdisf.c,v 1.8 2012/03/13 21:13:42 christos Exp $ */ +/* $NetBSD: floatdisf.c,v 1.9 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)floatdisf.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: floatdisf.c,v 1.8 2012/03/13 21:13:42 christos Exp $"); +__RCSID("$NetBSD: floatdisf.c,v 1.9 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" /* Index: src/lib/libc/quad/floatundidf.c diff -u src/lib/libc/quad/floatundidf.c:1.2 src/lib/libc/quad/floatundidf.c:1.3 --- src/lib/libc/quad/floatundidf.c:1.2 Tue Mar 13 21:13:42 2012 +++ src/lib/libc/quad/floatundidf.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: floatundidf.c,v 1.2 2012/03/13 21:13:42 christos Exp $ */ +/* $NetBSD: floatundidf.c,v 1.3 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)floatunsdidf.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: floatundidf.c,v 1.2 2012/03/13 21:13:42 christos Exp $"); +__RCSID("$NetBSD: floatundidf.c,v 1.3 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" /* Index: src/lib/libc/quad/floatundisf.c diff -u src/lib/libc/quad/floatundisf.c:1.2 src/lib/libc/quad/floatundisf.c:1.3 --- src/lib/libc/quad/floatundisf.c:1.2 Tue Mar 13 21:13:42 2012 +++ src/lib/libc/quad/floatundisf.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: floatundisf.c,v 1.2 2012/03/13 21:13:42 christos Exp $ */ +/* $NetBSD: floatundisf.c,v 1.3 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)floatdisf.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: floatundisf.c,v 1.2 2012/03/13 21:13:42 christos Exp $"); +__RCSID("$NetBSD: floatundisf.c,v 1.3 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" /* Index: src/lib/libc/quad/floatunditf_ieee754.c diff -u src/lib/libc/quad/floatunditf_ieee754.c:1.3 src/lib/libc/quad/floatunditf_ieee754.c:1.4 --- src/lib/libc/quad/floatunditf_ieee754.c:1.3 Sun Mar 25 19:53:18 2012 +++ src/lib/libc/quad/floatunditf_ieee754.c Sun Aug 5 04:28:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: floatunditf_ieee754.c,v 1.3 2012/03/25 19:53:18 christos Exp $ */ +/* $NetBSD: floatunditf_ieee754.c,v 1.4 2012/08/05 04:28:58 matt Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -38,10 +38,14 @@ #if 0 static char sccsid[] = "@(#)floatunsdidf.c 8.1 (Berkeley) 6/4/93"; #else -__RCSID("$NetBSD: floatunditf_ieee754.c,v 1.3 2012/03/25 19:53:18 christos Exp $"); +__RCSID("$NetBSD: floatunditf_ieee754.c,v 1.4 2012/08/05 04:28:58 matt Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +#ifdef SOFTFLOAT +#include "softfloat/softfloat-for-gcc.h" +#endif + #include "quad.h" #ifdef __vax__ #error vax does not support a distinct long double