CVS commit: [matt-nb5-mips64] src/lib/libc/softfloat

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Sat May 28 20:28:55 UTC 2011

Modified Files:
        src/lib/libc/softfloat/bits32 [matt-nb5-mips64]: softfloat-macros
        src/lib/libc/softfloat/bits64 [matt-nb5-mips64]: softfloat-macros

Log Message:
Sync to -HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.50.1 src/lib/libc/softfloat/bits32/softfloat-macros
cvs rdiff -u -r1.1 -r1.1.50.1 src/lib/libc/softfloat/bits64/softfloat-macros

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/softfloat/bits32/softfloat-macros
diff -u src/lib/libc/softfloat/bits32/softfloat-macros:1.1 src/lib/libc/softfloat/bits32/softfloat-macros:1.1.50.1
--- src/lib/libc/softfloat/bits32/softfloat-macros:1.1	Tue May 21 23:51:07 2002
+++ src/lib/libc/softfloat/bits32/softfloat-macros	Sat May 28 20:28:55 2011
@@ -311,7 +311,7 @@
     carry0 = ( z1 < a1 );
     z0 = a0 + b0;
     z1 += carry1;
-    z0 += ( z1 < carry1 );
+    z0 += ( z1 < (bits32)carry1 );
     z0 += carry0;
     *z2Ptr = z2;
     *z1Ptr = z1;
@@ -368,7 +368,7 @@
     z1 = a1 - b1;
     borrow0 = ( a1 < b1 );
     z0 = a0 - b0;
-    z0 -= ( z1 < borrow1 );
+    z0 -= ( z1 < (bits32)borrow1 );
     z1 -= borrow1;
     z0 -= borrow0;
     *z2Ptr = z2;

Index: src/lib/libc/softfloat/bits64/softfloat-macros
diff -u src/lib/libc/softfloat/bits64/softfloat-macros:1.1 src/lib/libc/softfloat/bits64/softfloat-macros:1.1.50.1
--- src/lib/libc/softfloat/bits64/softfloat-macros:1.1	Tue May 21 23:51:08 2002
+++ src/lib/libc/softfloat/bits64/softfloat-macros	Sat May 28 20:28:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat-macros,v 1.1 2002/05/21 23:51:08 bjh21 Exp $ */
+/* $NetBSD: softfloat-macros,v 1.1.50.1 2011/05/28 20:28:55 matt Exp $ */
 
 /*
 ===============================================================================
@@ -386,7 +386,7 @@
     carry0 = ( z1 < a1 );
     z0 = a0 + b0;
     z1 += carry1;
-    z0 += ( z1 < carry1 );
+    z0 += ( z1 < (bits64)carry1 );
     z0 += carry0;
     *z2Ptr = z2;
     *z1Ptr = z1;
@@ -443,7 +443,7 @@
     z1 = a1 - b1;
     borrow0 = ( a1 < b1 );
     z0 = a0 - b0;
-    z0 -= ( z1 < borrow1 );
+    z0 -= ( z1 < (bits64)borrow1 );
     z1 -= borrow1;
     z0 -= borrow0;
     *z2Ptr = z2;