Module Name: src
Committed By: matt
Date: Sun Jul 10 04:52:23 UTC 2011
Modified Files:
src/lib/libc/arch/sparc64: Makefile.inc
src/lib/libc/softfloat/bits64: softfloat.c
Log Message:
Fix so that float128_to_uint64_round_to_zero is defined for sparc64.
(isn't tha a namespace violation?)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/sparc64/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/softfloat/bits64/softfloat.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/arch/sparc64/Makefile.inc
diff -u src/lib/libc/arch/sparc64/Makefile.inc:1.16 src/lib/libc/arch/sparc64/Makefile.inc:1.17
--- src/lib/libc/arch/sparc64/Makefile.inc:1.16 Wed Jun 22 05:23:53 2011
+++ src/lib/libc/arch/sparc64/Makefile.inc Sun Jul 10 04:52:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2011/06/22 05:23:53 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.17 2011/07/10 04:52:23 matt Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
@@ -8,6 +8,7 @@
.PATH: ${ARCHDIR}/softfloat
SRCS+= qp.c
CPPFLAGS+= -DSOFTFLOATSPARC64_FOR_GCC -DEXCEPTIONS_WITH_SOFTFLOAT
+CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS
.if ${MKSOFTFLOAT} != "no"
.include <softfloat/Makefile.inc>
.else
Index: src/lib/libc/softfloat/bits64/softfloat.c
diff -u src/lib/libc/softfloat/bits64/softfloat.c:1.7 src/lib/libc/softfloat/bits64/softfloat.c:1.8
--- src/lib/libc/softfloat/bits64/softfloat.c:1.7 Sat Jul 9 02:28:31 2011
+++ src/lib/libc/softfloat/bits64/softfloat.c Sun Jul 10 04:52:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat.c,v 1.7 2011/07/09 02:28:31 matt Exp $ */
+/* $NetBSD: softfloat.c,v 1.8 2011/07/10 04:52:23 matt Exp $ */
/*
* This version hacked for use with gcc -msoft-float by bjh21.
@@ -46,7 +46,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: softfloat.c,v 1.7 2011/07/09 02:28:31 matt Exp $");
+__RCSID("$NetBSD: softfloat.c,v 1.8 2011/07/10 04:52:23 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#ifdef SOFTFLOAT_FOR_GCC
@@ -4482,7 +4482,8 @@
}
-#if defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS)
+#if (defined(SOFTFLOATSPARC64_FOR_GCC) || defined(SOFTFLOAT_FOR_GCC)) \
+ && defined(SOFTFLOAT_NEED_FIXUNS)
/*
* just like above - but do not care for overflow of signed results
*/
@@ -4532,7 +4533,7 @@
return z;
}
-#endif /* defined(SOFTFLOAT_FOR_GCC) && defined(SOFTFLOAT_NEED_FIXUNS) */
+#endif /* (SOFTFLOATSPARC64_FOR_GCC || SOFTFLOAT_FOR_GCC) && SOFTFLOAT_NEED_FIXUNS */
/*
-------------------------------------------------------------------------------
