[src/netbsd-1-4]: src/lib/libc/arch/arm32/fplib pullup 1.3->1.4 (kleink): fix...

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e07f7b62865e
branches:  netbsd-1-4
changeset: 469147:e07f7b62865e
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Jul 01 19:45:22 1999 +0000

description:
pullup 1.3->1.4 (kleink): fix namespace conflict

diffstat:

 lib/libc/arch/arm32/fplib/softfloat-specialize.h |  12 ++--
 lib/libc/arch/arm32/fplib/softfloat.c            |  60 ++++++++++++++++++------
 lib/libc/arch/arm32/fplib/softfloat.h            |  40 +++++++++++----
 3 files changed, 79 insertions(+), 33 deletions(-)

diffs (truncated from 448 to 300 lines):

diff -r 5c9c5ec7e268 -r e07f7b62865e lib/libc/arch/arm32/fplib/softfloat-specialize.h
--- a/lib/libc/arch/arm32/fplib/softfloat-specialize.h  Thu Jul 01 19:45:07 1999 +0000
+++ b/lib/libc/arch/arm32/fplib/softfloat-specialize.h  Thu Jul 01 19:45:22 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: softfloat-specialize.h,v 1.3 1998/01/06 00:06:12 perry Exp $   */
+/*     $NetBSD: softfloat-specialize.h,v 1.3.2.1 1999/07/01 19:45:22 perry Exp $       */
 
 /*
 ===============================================================================
@@ -30,15 +30,15 @@
 ===============================================================================
 */
 
-flag float32_is_signaling_nan( float32 a );
-flag float64_is_signaling_nan( float64 a );
+static flag float32_is_signaling_nan( float32 a );
+static flag float64_is_signaling_nan( float64 a );
 
 /*
 -------------------------------------------------------------------------------
 Underflow tininess-detection mode.  (Statically initialized to default.)
 -------------------------------------------------------------------------------
 */
-flag float_detect_tininess = float_tininess_after_rounding;
+static flag float_detect_tininess = float_tininess_after_rounding;
 
 /*
 -------------------------------------------------------------------------------
@@ -81,7 +81,7 @@
 NaN; otherwise returns false.
 -------------------------------------------------------------------------------
 */
-flag float32_is_signaling_nan( float32 a )
+static flag float32_is_signaling_nan( float32 a )
 {
 
     return ( ( a & 0x7FC00000 ) == 0x7F800000 ) && ( a & 0x003FFFFF );
@@ -94,7 +94,7 @@
 NaN; otherwise returns false.
 -------------------------------------------------------------------------------
 */
-flag float64_is_signaling_nan( float64 a )
+static flag float64_is_signaling_nan( float64 a )
 {
 
     return
diff -r 5c9c5ec7e268 -r e07f7b62865e lib/libc/arch/arm32/fplib/softfloat.c
--- a/lib/libc/arch/arm32/fplib/softfloat.c     Thu Jul 01 19:45:07 1999 +0000
+++ b/lib/libc/arch/arm32/fplib/softfloat.c     Thu Jul 01 19:45:22 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: softfloat.c,v 1.3 1998/01/06 00:06:12 perry Exp $      */
+/*     $NetBSD: softfloat.c,v 1.3.2.1 1999/07/01 19:46:06 perry Exp $  */
 
 /*
 ===============================================================================
@@ -564,6 +564,7 @@
 
 }
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns the result of converting the single-precision floating-point value
@@ -575,7 +576,7 @@
 integer with the same sign as `a' is returned.
 -------------------------------------------------------------------------------
 */
-int32 float32_to_int32( float32 a )
+static int32 float32_to_int32( float32 a )
 {
     flag aSign;
     int16 aExp, shiftCount;
@@ -631,6 +632,7 @@
     return z;
 
 }
+#endif /* unused */
 
 /*
 -------------------------------------------------------------------------------
@@ -705,6 +707,7 @@
 
 }
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns the result of converting the double-precision floating-point value
@@ -716,7 +719,8 @@
 integer with the same sign as `a' is returned.
 -------------------------------------------------------------------------------
 */
-int32 float64_to_int32( float64 a )
+
+static int32 float64_to_int32( float64 a )
 {
     flag aSign;
     int16 aExp, shiftCount;
@@ -778,6 +782,7 @@
     return z;
 
 }
+#endif /* unused */
 
 /*
 -------------------------------------------------------------------------------
@@ -864,6 +869,7 @@
 
 }
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Rounds the single-precision floating-point value `a' to an integer, and
@@ -872,7 +878,7 @@
 Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-float32 float32_round_to_int( float32 a )
+static float32 float32_round_to_int( float32 a )
 {
     flag aSign;
     int16 aExp;
@@ -924,6 +930,7 @@
     return z;
 
 }
+#endif /* unused */
 
 /*
 -------------------------------------------------------------------------------
@@ -1249,6 +1256,7 @@
 
 }
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns the remainder of the single-precision floating-point value `a'
@@ -1256,7 +1264,7 @@
 according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-float32 float32_rem( float32 a, float32 b )
+static float32 float32_rem( float32 a, float32 b )
 {
     flag aSign, bSign, zSign;
     int16 aExp, bExp, expDiff;
@@ -1337,7 +1345,9 @@
     return normalizeRoundAndPackFloat32( aSign ^ zSign, bExp, aSig );
 
 }
+#endif /* unused */
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns the square root of the single-precision floating-point value `a'.
@@ -1345,7 +1355,7 @@
 Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-float32 float32_sqrt( float32 a )
+static float32 float32_sqrt( float32 a )
 {
     flag aSign;
     int16 aExp, zExp;
@@ -1391,6 +1401,7 @@
     return roundAndPackFloat32( 0, zExp, zSig );
 
 }
+#endif /* unused */
 
 /*
 -------------------------------------------------------------------------------
@@ -1465,6 +1476,7 @@
 
 }
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns true if the single-precision floating-point value `a' is equal to
@@ -1473,7 +1485,8 @@
 the IEC/IEEE Standard for Binary Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-flag float32_eq_signaling( float32 a, float32 b )
+
+static flag float32_eq_signaling( float32 a, float32 b )
 {
 
     if (    ( ( extractFloat32Exp( a ) == 0xFF ) && extractFloat32Frac( a ) )
@@ -1485,7 +1498,9 @@
     return ( a == b ) || bothZeroFloat32( a, b );
 
 }
+#endif /* unused */
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns true if the single-precision floating-point value `a' is less than
@@ -1494,7 +1509,7 @@
 IEC/IEEE Standard for Binary Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-flag float32_le_quiet( float32 a, float32 b )
+static flag float32_le_quiet( float32 a, float32 b )
 {
     flag aSign, bSign;
 /*    int16 aExp, bExp;*/
@@ -1513,7 +1528,9 @@
     return ( a == b ) || ( aSign ^ ( a < b ) );
 
 }
+#endif /* unused */
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns true if the single-precision floating-point value `a' is less than
@@ -1522,7 +1539,7 @@
 Standard for Binary Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-flag float32_lt_quiet( float32 a, float32 b )
+static flag float32_lt_quiet( float32 a, float32 b )
 {
     flag aSign, bSign;
 
@@ -1540,7 +1557,9 @@
     return ( a != b ) && ( aSign ^ ( a < b ) );
 
 }
+#endif /* unused */
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Rounds the double-precision floating-point value `a' to an integer, and
@@ -1549,7 +1568,7 @@
 Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-float64 float64_round_to_int( float64 a )
+static float64 float64_round_to_int( float64 a )
 {
     flag aSign;
     int16 aExp;
@@ -1641,6 +1660,7 @@
     return z;
 
 }
+#endif /* unused */
 
 /*
 -------------------------------------------------------------------------------
@@ -2000,6 +2020,7 @@
 
 }
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns the remainder of the double-precision floating-point value `a'
@@ -2007,7 +2028,7 @@
 according to the IEC/IEEE Standard for Binary Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-float64 float64_rem( float64 a, float64 b )
+static float64 float64_rem( float64 a, float64 b )
 {
     flag aSign, bSign, zSign;
     int16 aExp, bExp, expDiff;
@@ -2105,7 +2126,9 @@
         normalizeRoundAndPackFloat64( aSign ^ zSign, bExp - 4, aSig0, aSig1 );
 
 }
+#endif /* unused */
 
+#if 0 /* unused */
 /*
 -------------------------------------------------------------------------------
 Returns the square root of the double-precision floating-point value `a'.
@@ -2113,7 +2136,7 @@
 Floating-point Arithmetic.
 -------------------------------------------------------------------------------
 */
-float64 float64_sqrt( float64 a )
+static float64 float64_sqrt( float64 a )
 {
     flag aSign;
     int16 aExp, zExp;
@@ -2179,6 +2202,7 @@
     return roundAndPackFloat64( 0, zExp, zSig0, zSig1, zSig2 );
 
 }
+#endif /* unused */