5262 libm needs to be carefully unifdef'd
5268 libm doesn't need to hide symbols which are already local

@@ -25,20 +25,18 @@
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#if defined(ELFOBJ)
 #pragma weak scalbnf = __scalbnf
-#endif
 
 #include "libm.h"
 #include <float.h>              /* FLT_MAX, FLT_MIN */
 #include <stdlib.h>             /* abs */
 
 static const float twom25f = 2.98023223876953125e-8F;
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
 static const float two23f = 8388608.0F;
 #else
 /*
  * v: a non-zero subnormal |x|; returns [-22, 0]
  */

@@ -53,11 +51,11 @@
         if (v & 0xf0)
                 r += 4, v >>= 4;
         v <<= 1;
         return (r + ((0xffffaa50 >> v) & 0x3));
 }
-#endif  /* defined(USE_FPSCALE) */
+#endif  /* defined(__x86) */
 
 float
 scalbnf(float x, int n) {
         int *px = (int *) &x, ix, k;
 

@@ -70,11 +68,11 @@
                 return (x + x);
 #endif
         if (ix == 0 || n == 0)
                 return (x);
         if (k == 0) {
-#if defined(USE_FPSCALE) || defined(__x86)
+#if defined(__x86)
                 x *= two23f;
                 k = ((*px & ~0x80000000) >> 23) - 23;
 #else
                 k = ilogbf_biased(ix);
                 *px = (*px & 0x80000000) | (ix << (-k + 1));